From: Michael <heluecht@pirati.ca>
Date: Thu, 24 Aug 2017 06:26:58 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into pleroma2
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ba52dd9fa713b1430241515c978de68991103445;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into pleroma2
---

ba52dd9fa713b1430241515c978de68991103445