From: Roland Haeder Date: Fri, 23 Dec 2016 17:57:41 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into develop X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=17858bd8443e0384602b71478fd0b1a00cfeafb1;p=friendica.git Merge remote-tracking branch 'upstream/develop' into develop Signed-off-by: Roland Haeder --- 17858bd8443e0384602b71478fd0b1a00cfeafb1