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

2015-08-20 22:14:51 -07:00
parent 3e7a76cc64 72bdca009c
commit 43fbbfe0df
5 changed files with 16 additions and 4 deletions
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'H');
 define ( 'ZOT_REVISION',            1     );

-define ( 'DB_UPDATE_VERSION',       1147  );
+define ( 'DB_UPDATE_VERSION',       1148  );

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