aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-06-14 10:37:54 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-06-14 10:37:54 +0200
commitb1184f3fdeb4dcc6126b7ea8d7ac1a2980c9cbac (patch)
tree07165e07f3c2e57e4719310195f1f2fd0a211c8d /boot.php
parent5882d8d022c14a12ba7b314c96289061bd195ed4 (diff)
parent9b9bd35cba293b86c871c2cfbe15e6d9c4673a7d (diff)
downloadvolse-hubzilla-b1184f3fdeb4dcc6126b7ea8d7ac1a2980c9cbac.tar.gz
volse-hubzilla-b1184f3fdeb4dcc6126b7ea8d7ac1a2980c9cbac.tar.bz2
volse-hubzilla-b1184f3fdeb4dcc6126b7ea8d7ac1a2980c9cbac.zip
Merge remote-tracking branch 'friendika-master/master' into admin
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 );