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

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

8af78079cbabe530554950ac241b24bbdcaf2cb7
diff --cc boot.php
index 2bdf6a602f,fdd2ccd8c5..0b4c66b632
--- 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.1394' );
 +define ( 'FRIENDICA_VERSION',      '3.0.1395' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1151      );
+ define ( 'DB_UPDATE_VERSION',      1152      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );