From: friendica <info@friendica.com>
Date: Sat, 12 Jan 2013 23:09:35 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=449b44fe4c9049f7bf93e0b2e688a1f7de404c97;p=friendica.git

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

449b44fe4c9049f7bf93e0b2e688a1f7de404c97
diff --cc boot.php
index 852b8eef33,721fbe6e9d..1a93086aea
--- a/boot.php
+++ b/boot.php
@@@ -12,9 -12,9 +12,9 @@@ require_once('library/Mobile_Detect/Mob
  require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.1.1584' );
 +define ( 'FRIENDICA_VERSION',      '3.1.1586' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1157      );
+ define ( 'DB_UPDATE_VERSION',      1158      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );