From: Ralf Thees <ralf@herrthees.de>
Date: Wed, 5 Sep 2018 18:08:56 +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=7edbef9bdc8336e6e842994c3e45f8f29325328a;p=friendica.git

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

7edbef9bdc8336e6e842994c3e45f8f29325328a