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

This commit is contained in:
zotlabs
2018-02-26 16:45:04 -08:00
810 changed files with 4534 additions and 140955 deletions

View File

@@ -50,10 +50,10 @@ require_once('include/attach.php');
require_once('include/bbcode.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '3.1.12' );
define ( 'STD_VERSION', '3.2RC' );
define ( 'ZOT_REVISION', '1.3' );
define ( 'DB_UPDATE_VERSION', 1204 );
define ( 'DB_UPDATE_VERSION', 1205 );
define ( 'PROJECT_BASE', __DIR__ );