aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-02 17:51:34 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-02 17:51:34 +0100
commit36ac48779c85ae324d2d702714677e360af5930d (patch)
treef6e78cb3cefe3abf5dcac291938005d75ecb0bff /boot.php
parent0cd82ec680e6a5a352781861a63685038fea723a (diff)
parent88669fa033d5b43d4cdad7b95c9af05bf9467d3b (diff)
downloadvolse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.tar.gz
volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.tar.bz2
volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 4b49cacb5..238935da3 100755
--- a/boot.php
+++ b/boot.php
@@ -48,7 +48,7 @@ require_once('include/AccessList.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')));
-define ( 'STD_VERSION', '1.1.3' );
+define ( 'STD_VERSION', '1.2' );
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1161 );