From: Michael <heluecht@pirati.ca>
Date: Sat, 16 Jun 2018 15:37:54 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into no-author-link
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6f9ec690aaa8e8a4ef4a487f2755cf68cee4b052;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into no-author-link
---

6f9ec690aaa8e8a4ef4a487f2755cf68cee4b052