From: Michael <heluecht@pirati.ca>
Date: Sun, 4 Nov 2018 23:19:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into diasppora-delivery
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dc4a2aeab869ebcc24a476f3ec49fa04b015d328;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into diasppora-delivery
---

dc4a2aeab869ebcc24a476f3ec49fa04b015d328