From: Friendica <friendica@friendica.astifter.com>
Date: Thu, 19 Apr 2018 19:24:35 +0000 (+0000)
Subject: Merge branch 'develop' of https://github.com/friendica/friendica into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dc4b38441483a6267c81b39bba2c267b1e7819e9;p=friendica.git

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

dc4b38441483a6267c81b39bba2c267b1e7819e9