From: Roland Häder Date: Sat, 7 Jan 2017 08:23:58 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into develop X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4f25396faeaa501907e93b24ee51ebdd08f84993;p=friendica.git Merge remote-tracking branch 'upstream/develop' into develop --- 4f25396faeaa501907e93b24ee51ebdd08f84993