From: Michael <heluecht@pirati.ca>
Date: Thu, 22 Mar 2018 20:42:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/3.6-rc' into url-shorten-ostatus
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=318de2f59066361db3acd2664a26d13d5069b4ea;p=friendica.git

Merge remote-tracking branch 'upstream/3.6-rc' into url-shorten-ostatus
---

318de2f59066361db3acd2664a26d13d5069b4ea