From: Fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 20 Jan 2016 07:50:18 +0000 (+0100)
Subject: Merge branch 'hotfix_diaspora' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7e83ba090f7ff3889aec8a2e8f2b578210a66dc8;p=friendica.git

Merge branch 'hotfix_diaspora' into develop
---

7e83ba090f7ff3889aec8a2e8f2b578210a66dc8