From: Michael <icarus@dabo.de>
Date: Sun, 26 Feb 2012 23:03:51 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=18679111f5aed8f1c5e7ccb9857195e52c57765d;p=friendica.git

Merge remote branch 'upstream/master'
---

18679111f5aed8f1c5e7ccb9857195e52c57765d
diff --cc boot.php
index e9f9efd70d,f348ae6e89..ada0f563d9
--- 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',      '2.3.1263' );
+ define ( 'FRIENDICA_VERSION',      '2.3.1264' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 -define ( 'DB_UPDATE_VERSION',      1126      );
 +define ( 'DB_UPDATE_VERSION',      1127      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );