From: fabrixxm <fabrix.xm@gmail.com>
Date: Mon, 22 Aug 2011 11:56:08 +0000 (+0200)
Subject: Merge branch 'master' into newui
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d8bd4fbb3e38bf0ff9c7b61dba58e20c0d097d75;p=friendica.git

Merge branch 'master' into newui
---

d8bd4fbb3e38bf0ff9c7b61dba58e20c0d097d75
diff --cc boot.php
index 399e100d0b,ae3c04b77c..bfdae47be1
--- 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.1074' );
+ define ( 'FRIENDIKA_VERSION',      '2.2.1079' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
- define ( 'DB_UPDATE_VERSION',      1079      );
+ define ( 'DB_UPDATE_VERSION',      1081      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );