diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-03-02 06:06:39 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-03-02 06:06:39 +0100 |
commit | 264abef81761a3ed0d27126dbc5a6e0a47fb8ec8 (patch) | |
tree | 883418e21b721217b28380f9313405373825650a /boot.php | |
parent | e084a85e79af2c56f6e715fcf44a1be815ea5c45 (diff) | |
parent | a0baa480e3968306c8ebc297a60f84b4d2ccf8c9 (diff) | |
download | volse-hubzilla-264abef81761a3ed0d27126dbc5a6e0a47fb8ec8.tar.gz volse-hubzilla-264abef81761a3ed0d27126dbc5a6e0a47fb8ec8.tar.bz2 volse-hubzilla-264abef81761a3ed0d27126dbc5a6e0a47fb8ec8.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'boot.php')
-rwxr-xr-x | boot.php | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 ); /** |