From: Michael <heluecht@pirati.ca>
Date: Sat, 28 Apr 2018 08:57:52 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=298aae5ddfef3011c7c625ef9bc40b5d4be313da;p=friendica.git

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

298aae5ddfef3011c7c625ef9bc40b5d4be313da