From: Philipp Holzer <admin@philipp.info>
Date: Tue, 26 Jun 2018 20:56:08 +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=2260b9c87375dbdff175f93d0eee5d6f321b9102;p=friendica.git

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

2260b9c87375dbdff175f93d0eee5d6f321b9102