aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-02-26 16:45:04 -0800
committerzotlabs <mike@macgirvin.com>2018-02-26 16:45:04 -0800
commitafe2ba36904de4d308fb0620ebef52d7eefecda0 (patch)
tree178f0e376f243c7fa048b4e389001234c07bd72e /boot.php
parent01776e767d1976663d2c36fd7e6e4431c16c84c1 (diff)
parentfe7fba4789fac2024c4e8e711e2f8a2492c683bd (diff)
downloadvolse-hubzilla-afe2ba36904de4d308fb0620ebef52d7eefecda0.tar.gz
volse-hubzilla-afe2ba36904de4d308fb0620ebef52d7eefecda0.tar.bz2
volse-hubzilla-afe2ba36904de4d308fb0620ebef52d7eefecda0.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 badc794b1..dbc5e6dcc 100755
--- a/boot.php
+++ b/boot.php
@@ -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__ );