From: ThibG <thib@sitedethib.com>
Date: Sat, 28 Mar 2020 14:19:05 +0000 (+0100)
Subject: Merge pull request #1308 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=a192b193bdf7013df09c6cd63916274cd9d47cf7;p=mastodon.git

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

Merge upstream changes
---

a192b193bdf7013df09c6cd63916274cd9d47cf7