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

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

0cb3dc92d3fc908a2b1e081421e4e411b2c52796