aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-09-08 20:15:27 +0200
committerfabrixxm <fabrix.xm@gmail.com>2011-09-08 20:15:27 +0200
commitd284f8017cefb79571fe51c4ae3f85b9b4e517c9 (patch)
treefbf1902147b237649048e2ab6ac8a84ffe0bf838 /boot.php
parent2fabf8d2188516a36589487bfa2ca01dea0c5ca2 (diff)
parent68c23f6c86e2f2e24548b179f00b5bcd5ab8ba87 (diff)
downloadvolse-hubzilla-d284f8017cefb79571fe51c4ae3f85b9b4e517c9.tar.gz
volse-hubzilla-d284f8017cefb79571fe51c4ae3f85b9b4e517c9.tar.bz2
volse-hubzilla-d284f8017cefb79571fe51c4ae3f85b9b4e517c9.zip
Merge remote-tracking branch 'friendika/master' 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 10195c2ba..f98e53044 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 );