From: Michael <heluecht@pirati.ca>
Date: Mon, 13 Mar 2017 10:18:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fbb84ee219678d7f8a0f2fde6c8d00358c3fc931;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
---

fbb84ee219678d7f8a0f2fde6c8d00358c3fc931