From: Roland Häder Date: Thu, 22 Dec 2016 08:03:44 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into develop X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4c04a78d1b6f14ce90e4ca0b23e356d234c4a296;p=friendica.git Merge remote-tracking branch 'upstream/develop' into develop --- 4c04a78d1b6f14ce90e4ca0b23e356d234c4a296