aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2016-03-01 22:09:06 +0100
committerjeroenpraat <jeroenpraat@xs4all.nl>2016-03-01 22:09:06 +0100
commit8b61e546fe488516fa3c5f37df80a68e346b84a9 (patch)
tree8af09fcff55cd613d5d2557a7c0956bd25a4afa3 /boot.php
parent7206e8af3a943b0fb286f253ed3abbda2d2572b6 (diff)
parent7808689198601780041e022bf0698e559869f305 (diff)
downloadvolse-hubzilla-8b61e546fe488516fa3c5f37df80a68e346b84a9.tar.gz
volse-hubzilla-8b61e546fe488516fa3c5f37df80a68e346b84a9.tar.bz2
volse-hubzilla-8b61e546fe488516fa3c5f37df80a68e346b84a9.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
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 7610f16d8..2a3a3d062 100755
--- a/boot.php
+++ b/boot.php
@@ -47,10 +47,10 @@ require_once('include/account.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')));
-define ( 'STD_VERSION', '1.2.4' );
+define ( 'STD_VERSION', '1.2.5' );
define ( 'ZOT_REVISION', 1 );
-define ( 'DB_UPDATE_VERSION', 1164 );
+define ( 'DB_UPDATE_VERSION', 1165 );
/**