From: friendica <info@friendica.com>
Date: Fri, 23 Nov 2012 04:54:16 +0000 (-0800)
Subject: Merge pull request #537 from fermionic/20121121-features
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=226d1ba7c13df83691699b74167866147137692f;p=friendica.git

Merge pull request #537 from fermionic/20121121-features

Port Features from Red
---

226d1ba7c13df83691699b74167866147137692f
diff --cc boot.php
index 1e8880306f,43e9399bcc..6794a1f9f5
--- a/boot.php
+++ b/boot.php
@@@ -9,9 -9,10 +9,10 @@@ require_once('include/pgettext.php')
  require_once('include/nav.php');
  require_once('include/cache.php');
  require_once('library/Mobile_Detect/Mobile_Detect.php');
+ require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.0.1527' );
 +define ( 'FRIENDICA_VERSION',      '3.0.1534' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
  define ( 'DB_UPDATE_VERSION',      1156      );