aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-16 08:33:01 +0100
committerzottel <github@zottel.net>2012-03-16 08:33:01 +0100
commitea4c806c5c3adacb6ef585de657e5f34c2e24c98 (patch)
tree1e3314f76eefd8f7d014ae8e4a218dc9663ae3d7 /boot.php
parent69f4448adaf7afddf00deeb2f832938d5505abcf (diff)
parent47e1b8d0c07d79c33f8b2de52145aa751d4b955a (diff)
downloadvolse-hubzilla-ea4c806c5c3adacb6ef585de657e5f34c2e24c98.tar.gz
volse-hubzilla-ea4c806c5c3adacb6ef585de657e5f34c2e24c98.tar.bz2
volse-hubzilla-ea4c806c5c3adacb6ef585de657e5f34c2e24c98.zip
Merge remote 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 04f36093b..86da3cd2e 100755
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1281' );
+define ( 'FRIENDICA_VERSION', '2.3.1282' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1131 );
+define ( 'DB_UPDATE_VERSION', 1132 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );