aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-06 12:57:25 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-06 12:57:25 +0100
commit2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32 (patch)
tree6935173702da59826d6c7577a927d96a57bc4478 /boot.php
parent2afdba48f06bb99922c19bf964d8f601c1545166 (diff)
parent021584d782c5bfafaa5ffe26d0c5850c8fffdd8f (diff)
downloadvolse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.tar.gz
volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.tar.bz2
volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.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 cb595e0ef..1628dd0fd 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.2' );
+define ( 'STD_VERSION', '1.2.1' );
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1161 );