From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 24 Feb 2015 08:09:02 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=caa21e6021dc2623aba8294f55279a31c94aab02;p=friendica.git

Merge branch 'master' into develop
---

caa21e6021dc2623aba8294f55279a31c94aab02
diff --cc boot.php
index 54ff948303,d74f38914c..fbf4a90d29
--- a/boot.php
+++ b/boot.php
@@@ -16,9 -16,9 +16,9 @@@ require_once('include/dbstructure.php')
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
  define ( 'FRIENDICA_CODENAME',     'Ginger');
- define ( 'FRIENDICA_VERSION',      '3.3.3-RC' );
+ define ( 'FRIENDICA_VERSION',      '3.3.3' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 -define ( 'DB_UPDATE_VERSION',      1178      );
 +define ( 'DB_UPDATE_VERSION',      1180      );
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );