From: friendica <info@friendica.com>
Date: Fri, 22 Feb 2013 00:43:01 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=280b72b9e665c730b9d02319f5ba0d7930b98326;p=friendica.git

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

280b72b9e665c730b9d02319f5ba0d7930b98326
diff --cc boot.php
index cd6f6a8d88,c03eca498e..200ce28172
--- a/boot.php
+++ b/boot.php
@@@ -12,10 -12,9 +12,9 @@@ require_once('library/Mobile_Detect/Mob
  require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.1.1614' );
 +define ( 'FRIENDICA_VERSION',      '3.1.1618' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1159      );
- 
+ define ( 'DB_UPDATE_VERSION',      1162      );
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );