Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts: install/update.php
2015-09-23 22:33:48 -07:00 · 2015-09-23 22:33:48 -07:00 · e04f04ef0f
commit e04f04ef0f
parent 0f3c2c4b24 8a94a4938f
2 changed files with 3 additions and 2 deletions
--- a/install/update.php
+++ b/install/update.php
@ -1874,3 +1874,4 @@ function update_r1154() {
    return UPDATE_FAILED;

 }
+
--- a/version.inc
+++ b/version.inc
@ -1 +1 @@
-2015-09-22.1163
+2015-09-23.1164