From: friendica <info@friendica.com>
Date: Fri, 23 Nov 2012 04:55:03 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ff9c19d75ab985baf616fbe357a8d80d60a72b6f;p=friendica.git

Merge https://github.com/friendica/friendica into pull
---

ff9c19d75ab985baf616fbe357a8d80d60a72b6f
diff --cc boot.php
index cfe8cbcbd3,6794a1f9f5..b83fe32a1e
--- 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.1534' );
 +define ( 'FRIENDICA_VERSION',      '3.0.1535' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
  define ( 'DB_UPDATE_VERSION',      1156      );