From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Tue, 27 Sep 2011 06:57:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'fabrix/newui'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=939449602a58838f81045c9a0e9a205c8fa9e6bd;p=friendica.git

Merge remote-tracking branch 'fabrix/newui'
---

939449602a58838f81045c9a0e9a205c8fa9e6bd
diff --cc boot.php
index 48d52846ee,44bfa868ab..5b32e05736
--- a/boot.php
+++ b/boot.php
@@@ -5,9 -5,10 +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.3.1115' );
 +define ( 'FRIENDIKA_VERSION',      '2.3.1116' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
  define ( 'DB_UPDATE_VERSION',      1092      );