From: Michael <heluecht@pirati.ca>
Date: Wed, 7 Jun 2017 18:17:37 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into issue-2864
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5aee2fde1bbbe8ed3ba7f91c5916ff291758ec15;p=friendica.git

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

5aee2fde1bbbe8ed3ba7f91c5916ff291758ec15