aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-03 08:21:28 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-03 08:21:28 +0200
commit9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21 (patch)
tree7b3af87ff4e4ef44999f69a6213b6f5df9ad2383 /boot.php
parentbda839635ceefac14c9d7892cd24d28fc6cdd596 (diff)
parentf2bdcb19e7f2748d3c368ab11deeb98d63fedca7 (diff)
downloadvolse-hubzilla-9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21.tar.gz
volse-hubzilla-9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21.tar.bz2
volse-hubzilla-9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21.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 f42d6beda..0af73c468 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.997' );
+define ( 'FRIENDIKA_VERSION', '2.2.999' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1059 );