From: Michael <heluecht@pirati.ca>
Date: Thu, 11 Jan 2018 22:51:53 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dc45bc3c842cf7b30708be4595aad9d65df11b9a;p=friendica.git

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

dc45bc3c842cf7b30708be4595aad9d65df11b9a