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/boot.php
+++ b/boot.php
@@ -50,7 +50,7 @@ define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'H');
 define ( 'ZOT_REVISION',            1     );

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

 /**
 * @brief Constant with a HTML line break.