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

Conflicts: boot.php install/update.php
2015-11-06 12:43:51 -08:00
parent 4620eb32d2 1c8f63f1e5
commit 9a42d63516
3 changed files with 27 additions and 8 deletions
--- a/boot.php
+++ b/boot.php
@@ -50,7 +50,8 @@ define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'H');
 define ( 'ZOT_REVISION',            1     );

-define ( 'DB_UPDATE_VERSION',       1159  );
+define ( 'DB_UPDATE_VERSION',       1160  );
+

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