Merge remote-tracking branch 'mike/master' into dev

2018-03-02 20:25:17 +01:00
parent 5c46e66694 dcfe9bc64f
commit 7c5f1e814b
6 changed files with 54 additions and 11 deletions
--- a/boot.php
+++ b/boot.php
@@ -51,7 +51,8 @@ require_once('include/bbcode.php');

 define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'STD_VERSION',             '3.3.2' );
-define ( 'ZOT_REVISION',            '1.3' );
+define ( 'ZOT_REVISION',            '6.0a' );
+

 define ( 'DB_UPDATE_VERSION',       1207 );