From: ThibG <thib@sitedethib.com>
Date: Mon, 12 Aug 2019 21:01:19 +0000 (+0200)
Subject: Merge pull request #1196 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=cf421bafdf644f8c8a44b4f06f82841cbd568cdf;p=mastodon.git

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

Merge upstream changes
---

cf421bafdf644f8c8a44b4f06f82841cbd568cdf