From: ThibG <thib@sitedethib.com>
Date: Thu, 27 Jun 2019 14:43:55 +0000 (+0200)
Subject: Merge pull request #1142 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2f95adc06fbfae22e8f9b4df212938108f5e295c;p=mastodon.git

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

Merge upstream changes
---

2f95adc06fbfae22e8f9b4df212938108f5e295c