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

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

611cbcfd069d9897c4fd31ae009cf4aebf5f9380