From: Domovoy <domovoy@errlock.org>
Date: Mon, 30 Jul 2012 11:36:33 +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=07f87848b4cc89bcfe8b48917f1a305f6e10b981;p=friendica.git

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

07f87848b4cc89bcfe8b48917f1a305f6e10b981
diff --cc boot.php
index 90d5c856e0,1f6937b648..e0b768171a
--- 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.1418' );
+ define ( 'FRIENDICA_VERSION',      '3.0.1419' );
  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' );