From: ThibG <thib@sitedethib.com>
Date: Wed, 15 Jul 2020 14:56:33 +0000 (+0200)
Subject: Merge pull request #1382 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=37c092e9fdedd36c167e4b84610e7346c446e1d3;p=mastodon.git

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

Merge upstream changes
---

37c092e9fdedd36c167e4b84610e7346c446e1d3