aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-05-20 20:19:11 -0700
committerzotlabs <mike@macgirvin.com>2018-05-20 20:19:11 -0700
commit0044906fabbfeb837326982bbc8d3fcc64b47fa8 (patch)
treeaa855fe68a468626b15f9b954c000680bb405b0b /boot.php
parentac8706e919d62a3a487fe3776e03160454ca8992 (diff)
parent469809183d232761b8984848c133f9f11f5e7cea (diff)
downloadvolse-hubzilla-0044906fabbfeb837326982bbc8d3fcc64b47fa8.tar.gz
volse-hubzilla-0044906fabbfeb837326982bbc8d3fcc64b47fa8.tar.bz2
volse-hubzilla-0044906fabbfeb837326982bbc8d3fcc64b47fa8.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index b19817197..9b3b86381 100755
--- a/boot.php
+++ b/boot.php
@@ -50,11 +50,11 @@ require_once('include/attach.php');
require_once('include/bbcode.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
-define ( 'STD_VERSION', '3.5.4' );
+define ( 'STD_VERSION', '3.5.6' );
define ( 'ZOT_REVISION', '6.0a' );
-define ( 'DB_UPDATE_VERSION', 1212 );
+define ( 'DB_UPDATE_VERSION', 1214 );
define ( 'PROJECT_BASE', __DIR__ );