From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Tue, 30 Aug 2011 09:00:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'friendika/master' into newui
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d0926240a87327a7e38b822802ac192336f68791;p=friendica.git

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

d0926240a87327a7e38b822802ac192336f68791
diff --cc boot.php
index bfdae47be1,46f1e318c0..4baa37309c
--- a/boot.php
+++ b/boot.php
@@@ -5,12 -5,11 +5,12 @@@ 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.1079' );
+ define ( 'FRIENDIKA_VERSION',      '2.2.1087' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
- define ( 'DB_UPDATE_VERSION',      1081      );
+ define ( 'DB_UPDATE_VERSION',      1084      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );