From: ThibG <thib@sitedethib.com>
Date: Fri, 17 Apr 2020 20:36:48 +0000 (+0200)
Subject: Merge pull request #1318 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=62e65dca11e1c39630db2958c514c45407dcdfa7;p=mastodon.git

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

Merge upstream changes
---

62e65dca11e1c39630db2958c514c45407dcdfa7