From: ThibG <thib@sitedethib.com>
Date: Thu, 14 May 2020 21:30:05 +0000 (+0200)
Subject: Merge pull request #1329 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b7e178d2e4102bdaa1ea41dfd8ed50093cf3f60a;p=mastodon.git

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

Merge upstream changes
---

b7e178d2e4102bdaa1ea41dfd8ed50093cf3f60a