aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-01 07:56:27 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-01 07:56:27 +0200
commit2413a6b422d5c49024d9c2c9cff79cbc82ba3a56 (patch)
treec531676a196ad7defdeefd56ea2519afd4c61a44 /boot.php
parent745d075397941e0a84d017342bb9c4c4a4c1ef5b (diff)
parentfc34641d4a69580a4e7fd5c3806c22d009d5d037 (diff)
downloadvolse-hubzilla-2413a6b422d5c49024d9c2c9cff79cbc82ba3a56.tar.gz
volse-hubzilla-2413a6b422d5c49024d9c2c9cff79cbc82ba3a56.tar.bz2
volse-hubzilla-2413a6b422d5c49024d9c2c9cff79cbc82ba3a56.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 a829daf9c..f42d6beda 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.996' );
+define ( 'FRIENDIKA_VERSION', '2.2.997' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1059 );