From: ThibG <thib@sitedethib.com>
Date: Thu, 7 Nov 2019 12:41:56 +0000 (+0100)
Subject: Merge pull request #1242 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=dd2ec970dbe39f09d3da32d6a8f524aaad68a9d6;p=mastodon.git

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

Merge upstream changes
---

dd2ec970dbe39f09d3da32d6a8f524aaad68a9d6