From: Michael <heluecht@pirati.ca>
Date: Sun, 17 Dec 2017 12:10:32 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into issue-4069
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=995f2d719d4ef964033d0d819fd01447be52b161;p=friendica.git

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

995f2d719d4ef964033d0d819fd01447be52b161