From: Michael Vogel <icarus@dabo.de>
Date: Tue, 29 Sep 2015 08:25:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1509-worker
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5d5d85eb4afff6237f1b88fae7df715392bca449;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1509-worker
---

5d5d85eb4afff6237f1b88fae7df715392bca449
diff --cc boot.php
index 22cd34e062,dcf6c65b1e..5f633fd878
--- a/boot.php
+++ b/boot.php
@@@ -17,9 -17,9 +17,9 @@@ require_once('include/dbstructure.php')
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
  define ( 'FRIENDICA_CODENAME',     'Lily of the valley');
- define ( 'FRIENDICA_VERSION',      '3.4.1' );
+ define ( 'FRIENDICA_VERSION',      '3.4.2' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 -define ( 'DB_UPDATE_VERSION',      1188      );
 +define ( 'DB_UPDATE_VERSION',      1189      );
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );