From: ThibG <thib@sitedethib.com>
Date: Sat, 18 Apr 2020 14:22:31 +0000 (+0200)
Subject: Merge pull request #1319 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d5530827c984238f93100ee737ed209d61e316c0;p=mastodon.git

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

Merge upstream changes
---

d5530827c984238f93100ee737ed209d61e316c0