From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 14 Apr 2017 23:03:21 +0000 (+0200)
Subject: Merge develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d2b3e0daf57319caa80393914102d575d464a6ea;p=friendica.git

Merge develop
---

d2b3e0daf57319caa80393914102d575d464a6ea