From: Roland Häder <roland@mxchange.org>
Date: Mon, 19 Dec 2016 08:40:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ff569756ee6c5e058700cf6428918f059525e77c;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/follow.php
---

ff569756ee6c5e058700cf6428918f059525e77c