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

2015-09-28 19:06:10 -07:00
parent 8a3c909c74 3a8e1e0484
commit 50ee82e8bd
3 changed files with 11 additions and 1 deletions
--- a/install/update.php
+++ b/install/update.php
@@ -1884,3 +1884,7 @@ function update_r1155() {
 		return UPDATE_SUCCESS;
 	return UPDATE_FAILED;
 }
+
+function update_r1155() {
+	return UPDATE_SUCCESS;
+}