From: Michael <heluecht@pirati.ca>
Date: Thu, 26 Apr 2018 20:42:57 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into reworked-delivery
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a785d8c2f9a95b933c8a81566331874e47926dd5;p=friendica.git

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

a785d8c2f9a95b933c8a81566331874e47926dd5