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

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

Merge upstream changes
---

da7e0d4f5536a43da88103320482a7b54eb8615b