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

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

05dcedb54c8c8f2b48e47fa11cb6dd4586bdd9bb