aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-07 00:02:40 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-07 00:02:40 +0100
commitbfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14 (patch)
tree19198a800f4eb67f7abdd2db273e4d52469faf4f /boot.php
parent1f82beb2ef4b04d8da8dca4485c9dd64aa86d86b (diff)
parent761afd029d97703f2f7609d546b7b5f3d257c601 (diff)
downloadvolse-hubzilla-bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14.tar.gz
volse-hubzilla-bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14.tar.bz2
volse-hubzilla-bfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14.zip
Merge remote-tracking branch 'upstream/master'
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 a3e35f63c..4c2cff09b 100755
--- a/boot.php
+++ b/boot.php
@@ -47,8 +47,8 @@ require_once('include/AccessList.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
-define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
-define ( 'STD_VERSION', '1.0.1' );
+define ( 'RED_VERSION', trim(file_get_contents('version.inc')));
+define ( 'STD_VERSION', '1.1' );
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1161 );