From: Michael <heluecht@pirati.ca>
Date: Fri, 5 Oct 2018 21:04:17 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8dc1d19381d2974e2c99efff6a654aa8c24239ae;p=friendica.git

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

8dc1d19381d2974e2c99efff6a654aa8c24239ae