From: friendica <info@friendica.com>
Date: Fri, 6 Apr 2012 04:43:38 +0000 (-0700)
Subject: Merge branch 'pull'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4bee1859be5fbf46ecc19728a908e31b4e9b09b6;p=friendica.git

Merge branch 'pull'
---

4bee1859be5fbf46ecc19728a908e31b4e9b09b6
diff --cc boot.php
index 189eb923aa,680ebde55c..e1bcc078a5
mode 100755,100644..100644
--- 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.1302' );
 +define ( 'FRIENDICA_VERSION',      '2.3.1303' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1134      );
+ define ( 'DB_UPDATE_VERSION',      1135      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --cc mod/network.php
index b12bd16dab,d27945a860..b12bd16dab
mode 100755,100644..100644
--- a/mod/network.php
+++ b/mod/network.php
diff --cc util/messages.po
index 6f0560965e,60c71f7fef..6f0560965e
mode 100755,100644..100644
--- a/util/messages.po
+++ b/util/messages.po