From: fabrixxm <fabrix.xm@gmail.com>
Date: Thu, 8 Sep 2011 18:15:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'friendika/master' into newui
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d284f8017cefb79571fe51c4ae3f85b9b4e517c9;p=friendica.git

Merge remote-tracking branch 'friendika/master' into newui
---

d284f8017cefb79571fe51c4ae3f85b9b4e517c9
diff --cc boot.php
index 10195c2bac,5563901fb7..f98e530442
--- a/boot.php
+++ b/boot.php
@@@ -5,10 -5,9 +5,10 @@@ require_once('include/network.php')
  require_once('include/plugin.php');
  require_once('include/text.php');
  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      );