aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-05-31 07:36:25 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-05-31 07:36:25 +0200
commit745d075397941e0a84d017342bb9c4c4a4c1ef5b (patch)
tree98c1e5e93952b281dbedb63c1fb2e18344153202 /boot.php
parent087f79236e79975d482f739e84cc16f6648e1bec (diff)
parentf95ea14478e256d7eb331385746f83532d78d84a (diff)
downloadvolse-hubzilla-745d075397941e0a84d017342bb9c4c4a4c1ef5b.tar.gz
volse-hubzilla-745d075397941e0a84d017342bb9c4c4a4c1ef5b.tar.bz2
volse-hubzilla-745d075397941e0a84d017342bb9c4c4a4c1ef5b.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 0495c97d7..a829daf9c 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.995' );
+define ( 'FRIENDIKA_VERSION', '2.2.996' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1059 );