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

2018-01-08 14:51:16 -08:00
parent 62f0266f46 0600817ef7
commit dfb75840b8
14 changed files with 80 additions and 128 deletions
--- a/boot.php
+++ b/boot.php
@@ -51,7 +51,7 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');

 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '3.1' );
+define ( 'STD_VERSION',             '3.1.1' );
 define ( 'ZOT_REVISION',            '1.3' );

 define ( 'DB_UPDATE_VERSION',       1198  );