aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-14 08:10:38 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-14 08:10:38 +0200
commitd08b068031f01e1bcf57a46b9e7dfcb217b6fb30 (patch)
treefc700a19369cb7cc2d84966c042a6ef55db10983 /boot.php
parent4d3c6941cafb3b8a7e1d2ccccd5003a2dc468a4d (diff)
parent9b9bd35cba293b86c871c2cfbe15e6d9c4673a7d (diff)
downloadvolse-hubzilla-d08b068031f01e1bcf57a46b9e7dfcb217b6fb30.tar.gz
volse-hubzilla-d08b068031f01e1bcf57a46b9e7dfcb217b6fb30.tar.bz2
volse-hubzilla-d08b068031f01e1bcf57a46b9e7dfcb217b6fb30.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 b8b0dc059..8edc74910 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.1007' );
+define ( 'FRIENDIKA_VERSION', '2.2.1010' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1063 );