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

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

a298a1f8d59b5cbc331aae66a5e46d3308dd7e43