From: Michael <heluecht@pirati.ca>
Date: Thu, 16 Mar 2017 05:51:22 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a211c8cb7757fc00db8db1d4241ebd3747b88c65;p=friendica.git

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

a211c8cb7757fc00db8db1d4241ebd3747b88c65