From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Tue, 20 Dec 2016 20:29:30 +0000 (-0500)
Subject: Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e54ee2e5091eafe7fa22baa213a798f9e6f58b01;p=friendica.git

Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension

# Conflicts:
#	include/follow.php
---

e54ee2e5091eafe7fa22baa213a798f9e6f58b01