From: ThibG <thib@sitedethib.com>
Date: Wed, 24 Jul 2019 14:53:25 +0000 (+0200)
Subject: Merge pull request #1176 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=88e79c179a1a48feff3b16226c46f5885442651e;p=mastodon.git

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

Merge upstream changes
---

88e79c179a1a48feff3b16226c46f5885442651e