From: ThibG <thib@sitedethib.com>
Date: Sun, 8 Dec 2019 20:27:36 +0000 (+0100)
Subject: Merge pull request #1251 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=246addd5b33a172600342af3fb6fb5e4c80ad95e;p=mastodon.git

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

Merge upstream changes
---

246addd5b33a172600342af3fb6fb5e4c80ad95e