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

2015-09-22 02:34:05 -07:00 · 2015-09-22 02:34:05 -07:00 · 2b07a69b93
commit 2b07a69b93
parent 0b1b11ea53 5068ce0569
2 changed files with 5 additions and 1 deletions
--- a/install/update.php
+++ b/install/update.php
@ -1865,3 +1865,7 @@ function update_r1153() {


 }
+
+function update_r1153() {
+	return UPDATE_SUCCESS;
+}
--- a/version.inc
+++ b/version.inc
@ -1 +1 @@
-2015-09-21.1162
+2015-09-22.1163