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

Conflicts: install/update.php
2015-10-15 16:02:37 -07:00
parent bf5a1f662a e26f771cbe
commit 7517c76ae4
5 changed files with 39 additions and 8 deletions
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php

-define( 'UPDATE_VERSION' , 1156 );
+define( 'UPDATE_VERSION' , 1157 );

 /**
 *
@@ -1885,3 +1885,8 @@ function update_r1155() {
 	return UPDATE_FAILED;
 }

+
+function update_r1156() {
+	return UPDATE_SUCCESS;
+}
+