From: ThibG <thib@sitedethib.com>
Date: Tue, 7 Jan 2020 15:47:02 +0000 (+0100)
Subject: Merge pull request #1261 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9871466958a5db6c4b75cab120eb6ca706c26d7e;p=mastodon.git

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

Merge upstream changes
---

9871466958a5db6c4b75cab120eb6ca706c26d7e