From: Domovoy <domovoy@errlock.org>
Date: Sat, 4 Aug 2012 21:33:06 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=786e9064f2c1281964b9153a8ba5a5511eca72f6;p=friendica.git

Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
---

786e9064f2c1281964b9153a8ba5a5511eca72f6
diff --cc boot.php
index 170c9953b9,25f89abf49..ac1c7bc824
--- a/boot.php
+++ b/boot.php
@@@ -11,9 -11,9 +11,9 @@@ require_once('include/cache.php')
  require_once('library/Mobile_Detect/Mobile_Detect.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '3.0.1423' );
+ define ( 'FRIENDICA_VERSION',      '3.0.1424' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 -define ( 'DB_UPDATE_VERSION',      1154      );
 +define ( 'DB_UPDATE_VERSION',      1155      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );