From: ThibG <thib@sitedethib.com>
Date: Thu, 20 Jun 2019 17:19:30 +0000 (+0200)
Subject: Merge pull request #1134 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f717d7a92da83703d270af50310fa3483b503417;p=mastodon.git

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

Merge upstream changes
---

f717d7a92da83703d270af50310fa3483b503417