From: Michael <heluecht@pirati.ca>
Date: Sat, 15 Jul 2017 10:36:56 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f65d6531cafe625d6be011e135d132ae48fc7c06;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
---

f65d6531cafe625d6be011e135d132ae48fc7c06