From: ThibG <thib@sitedethib.com>
Date: Tue, 20 Aug 2019 10:09:11 +0000 (+0200)
Subject: Merge pull request #1199 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=bce46f2057b06e78958a42821f3ce18c945de88d;p=mastodon.git

Merge pull request #1199 from ThibG/glitch-soc/merge-upstream

Merge upstream changes
---

bce46f2057b06e78958a42821f3ce18c945de88d