From: Michael <heluecht@pirati.ca>
Date: Tue, 25 Apr 2017 20:23:38 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1704-conversation
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2e4db2e64e268da2fbca566e98e38762adae0b35;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1704-conversation
---

2e4db2e64e268da2fbca566e98e38762adae0b35