aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-09-15 10:39:41 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-09-15 10:39:41 +0200
commit019b735ec75989336826e5ad5db6377803ecb050 (patch)
tree15b642ec6e24d07d9d5c6009ec2ebf2a0b720742 /boot.php
parent7e806429cca6ac39a9ef1bd1fd400d03e626389b (diff)
parentd284f8017cefb79571fe51c4ae3f85b9b4e517c9 (diff)
downloadvolse-hubzilla-019b735ec75989336826e5ad5db6377803ecb050.tar.gz
volse-hubzilla-019b735ec75989336826e5ad5db6377803ecb050.tar.bz2
volse-hubzilla-019b735ec75989336826e5ad5db6377803ecb050.zip
Merge branch 'newui' of github.com:fabrixxm/friendika into newui
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 4798d55d3..f171bdac7 100644
--- a/boot.php
+++ b/boot.php
@@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php');
-define ( 'FRIENDIKA_VERSION', '2.2.1093' );
+define ( 'FRIENDIKA_VERSION', '2.2.1096' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1087 );