From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 27 May 2021 15:58:44 +0000 (+0200)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=10a31a934fb62a95d6144794b9c449f1092593f0;p=mastodon.git

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

Conflicts:
- `README.md`:
  Upstream's README got updated, but we have a completely different one.
  Kept ours.
---

10a31a934fb62a95d6144794b9c449f1092593f0