From: Michael <heluecht@pirati.ca>
Date: Thu, 12 Apr 2018 08:53:56 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into issue-4816
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e83e31a968f2965e452d1ee109d31b61da0f0ac2;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into issue-4816
---

e83e31a968f2965e452d1ee109d31b61da0f0ac2