aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-16 15:30:51 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-16 15:30:51 +0200
commitbca1dcf2d6e243ca803e590168305ed5a232d923 (patch)
tree7e2e8b5ac3fd8734fc53f1cb22a81169860e6059 /boot.php
parentae3c9b7b2b6f6b8bf7a5d5e72bd66f1bff3b081d (diff)
parentc92e6ed929ddb12a3020eecf419a30b680fe4240 (diff)
downloadvolse-hubzilla-bca1dcf2d6e243ca803e590168305ed5a232d923.tar.gz
volse-hubzilla-bca1dcf2d6e243ca803e590168305ed5a232d923.tar.bz2
volse-hubzilla-bca1dcf2d6e243ca803e590168305ed5a232d923.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 5b7b60480..49247eb23 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000);
-define ( 'FRIENDIKA_VERSION', '2.2.1011' );
+define ( 'FRIENDIKA_VERSION', '2.2.1012' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1063 );