From: Michael <heluecht@pirati.ca>
Date: Fri, 16 Jun 2017 06:10:35 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1706-diaspora2
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5a11ef5b9066de5f2f262ca926c51aeb6285bb18;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1706-diaspora2
---

5a11ef5b9066de5f2f262ca926c51aeb6285bb18