From: friendica <info@friendica.com>
Date: Sun, 26 Feb 2012 23:07:34 +0000 (-0800)
Subject: Merge pull request #50 from annando/master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=89560edde2fe3fb198b558479e9c2300fc4185fd;p=friendica.git

Merge pull request #50 from annando/master

massive changes in mail and design updates in "vier"
---

89560edde2fe3fb198b558479e9c2300fc4185fd
diff --cc boot.php
index f348ae6e89,e9f9efd70d..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' );