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

Conflicts: util/messages.po
2015-09-18 22:46:21 -07:00
parent 43251ed8ce 7c8706757d
commit 74827133b2
8 changed files with 21 additions and 14 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',       1152  );
+define ( 'DB_UPDATE_VERSION',       1153  );

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