From: Michael <heluecht@pirati.ca>
Date: Wed, 6 Dec 2017 14:56:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ee52ae4c21a01d03f437a73d5680d4ace877c9eb;p=friendica.git

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

ee52ae4c21a01d03f437a73d5680d4ace877c9eb