From: Thibaut Girka <thib@sitedethib.com>
Date: Sun, 12 Apr 2020 14:50:27 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=fdd0beefa7176f4d0df3adcf37156229889127d7;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.
---

fdd0beefa7176f4d0df3adcf37156229889127d7