From: Michael <heluecht@pirati.ca>
Date: Sun, 1 Apr 2018 04:49:28 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into dfrn-2
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7dd64dd465117321cdb1e7fce6de6161e92134d8;p=friendica.git

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

7dd64dd465117321cdb1e7fce6de6161e92134d8