Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge

2018-07-18 19:14:21 -07:00
parent ec852b0c8d eb322e8312
commit 13d19d42cb
6 changed files with 2074 additions and 1599 deletions
--- a/boot.php
+++ b/boot.php
@@ -50,7 +50,7 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');

 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '3.5.8' );
+define ( 'STD_VERSION',             '3.7' );
 define ( 'ZOT_REVISION',            '6.0a' );