From: friendica <info@friendica.com>
Date: Sun, 3 Jun 2012 21:48:28 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9f4b89726176f9596cf3330a68cfab8cab5ab361;p=friendica.git

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

9f4b89726176f9596cf3330a68cfab8cab5ab361
diff --cc boot.php
index 6a4287819f,742948f7bf..18313b4cdf
--- a/boot.php
+++ b/boot.php
@@@ -9,9 -9,9 +9,9 @@@ require_once('include/nav.php')
  require_once('include/cache.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.0.1362' );
 +define ( 'FRIENDICA_VERSION',      '3.0.1363' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1147      );
+ define ( 'DB_UPDATE_VERSION',      1148      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );