Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2017-03-25 14:40:31 -07:00
parent 5c63f7dd58 2115eb26a7
commit e5e0a6b31f
178 changed files with 15561 additions and 11282 deletions
--- a/boot.php
+++ b/boot.php
@@ -50,6 +50,7 @@ require_once('include/hubloc.php');

 define ( 'PLATFORM_NAME',           'red' );
 define ( 'STD_VERSION',             '5.3' );
+
 define ( 'ZOT_REVISION',            '1.2' );

 define ( 'DB_UPDATE_VERSION',       1188  );