From: Roland Häder Date: Fri, 6 Jan 2017 16:10:40 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into develop X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4530f4ac9db4a3f9d53ef34ee7a185e2b31cc9be;p=friendica.git Merge remote-tracking branch 'upstream/develop' into develop --- 4530f4ac9db4a3f9d53ef34ee7a185e2b31cc9be