From: Michael <heluecht@pirati.ca>
Date: Wed, 30 Aug 2017 06:22:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into json-webfinger
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=157473e4f69b9865ac6a8d65ad20ea4218d5b08a;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into json-webfinger
---

157473e4f69b9865ac6a8d65ad20ea4218d5b08a