From: Roland Häder Date: Tue, 20 Dec 2016 14:50:39 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into develop X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a020086128e3d903a030cc3b3d403ab9bce02d88;p=friendica.git Merge remote-tracking branch 'upstream/develop' into develop --- a020086128e3d903a030cc3b3d403ab9bce02d88