From: Friendika <info@friendika.com>
Date: Sun, 19 Jun 2011 22:56:07 +0000 (-0700)
Subject: Merge branch 'pull'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=76ddbff0b5184c85be1e7ad2ffe6fb918ed65b65;p=friendica.git

Merge branch 'pull'
---

76ddbff0b5184c85be1e7ad2ffe6fb918ed65b65
diff --cc boot.php
index eeaf00f1a0,555d2405c1..1364385a1b
--- a/boot.php
+++ b/boot.php
@@@ -4,9 -4,9 +4,9 @@@ set_time_limit(0)
  ini_set('pcre.backtrack_limit', 250000);
  
  
 -define ( 'FRIENDIKA_VERSION',      '2.2.1015' );
 +define ( 'FRIENDIKA_VERSION',      '2.2.1016' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
- define ( 'DB_UPDATE_VERSION',      1063      );
+ define ( 'DB_UPDATE_VERSION',      1064      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );