From: friendica <info@friendica.com>
Date: Mon, 23 Jul 2012 23:51:02 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dbdcbaa7ef8b5f0faabd0f41ed630c6ce7c8e057;p=friendica.git

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

dbdcbaa7ef8b5f0faabd0f41ed630c6ce7c8e057
diff --cc boot.php
index 340ef13994,bcff5dddd2..76a11652d1
--- a/boot.php
+++ b/boot.php
@@@ -10,9 -10,9 +10,9 @@@ require_once('include/nav.php')
  require_once('include/cache.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.0.1412' );
 +define ( 'FRIENDICA_VERSION',      '3.0.1413' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1153      );
+ define ( 'DB_UPDATE_VERSION',      1154      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );