aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-19 09:34:39 +0100
committerzottel <github@zottel.net>2012-03-19 09:34:39 +0100
commit6d31e3d6ef56e22ecedccaeb6846b52da501097b (patch)
tree86518b59c0318d8057a1a8503c6354ebaa96dae3 /boot.php
parentdf78c9be0bab909dfa8cf196f7aaa4ea3423be8c (diff)
parent283bc51acf479eebd54145eb639c681980f6717b (diff)
downloadvolse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.tar.gz
volse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.tar.bz2
volse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.zip
Merge remote 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 b0a631170..d5feaed2d 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1283' );
+define ( 'FRIENDICA_VERSION', '2.3.1285' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1132 );