From: Friendika <info@friendika.com>
Date: Mon, 18 Apr 2011 06:28:39 +0000 (-0700)
Subject: Merge branch 'imap'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=229eb9c681d62edc5faa63bb1d66046d123c3f35;p=friendica.git

Merge branch 'imap'
---

229eb9c681d62edc5faa63bb1d66046d123c3f35
diff --cc boot.php
index 73f457980b,9072a135d2..f06ad13e64
--- a/boot.php
+++ b/boot.php
@@@ -2,9 -2,9 +2,9 @@@
  
  set_time_limit(0);
  
 -define ( 'FRIENDIKA_VERSION',      '2.1.950' );
 +define ( 'FRIENDIKA_VERSION',      '2.1.951' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
- define ( 'DB_UPDATE_VERSION',      1052      );
+ define ( 'DB_UPDATE_VERSION',      1053      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );