From: Hypolite Petovan <ben.lort@gmail.com>
Date: Wed, 15 Mar 2017 03:11:53 +0000 (-0400)
Subject: Merge branch 'develop' of https://github.com/friendica/friendica into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2ff494d899f239e6005a073b503d5c24b77119eb;p=friendica.git

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

2ff494d899f239e6005a073b503d5c24b77119eb