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

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

c118c03a70ad783a5cc75c1be80d594eae6ca954