From: Ralf Thees <ralf@herrthees.de>
Date: Sun, 23 Sep 2018 12:06:17 +0000 (+0200)
Subject: Merge branch 'develop' of https://github.com/friendica/friendica into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=306688057d64a156969eff79fff546c82d8e616a;p=friendica.git

Merge branch 'develop' of https://github.com/friendica/friendica into develop
---

306688057d64a156969eff79fff546c82d8e616a