From: ThibG <thib@sitedethib.com>
Date: Sun, 8 Mar 2020 21:09:53 +0000 (+0100)
Subject: Merge pull request #1297 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=840b17e3444f9a68d3639f1ffeb326e8cb1e03b1;p=mastodon.git

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

Merge upstream changes
---

840b17e3444f9a68d3639f1ffeb326e8cb1e03b1