From: Roland Haeder Date: Tue, 20 Dec 2016 18:33:40 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into develop X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b6d11f21297331cda361ebadca3c1cf453027fdd;p=friendica.git Merge remote-tracking branch 'upstream/develop' into develop --- b6d11f21297331cda361ebadca3c1cf453027fdd