From: Michael <heluecht@pirati.ca>
Date: Tue, 14 Mar 2017 07:26:15 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=43ceb721963fb7c303d26ef5a999a275144dd5c6;p=friendica.git

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

43ceb721963fb7c303d26ef5a999a275144dd5c6