From: Ralf Thees <ralf@herrthees.de>
Date: Wed, 24 Oct 2018 19:14:45 +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=dfbaa6e198d26bf1e921bae62923a820bef7925d;p=friendica.git

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

dfbaa6e198d26bf1e921bae62923a820bef7925d