From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 16 Jan 2022 17:11:20 +0000 (+0100)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b61c3ddff8338432fdc287f6bebbf76a12859c17;p=mastodon.git

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

Conflicts:
- `README.md`:
  Upstream added some text, but our README is completely different.
  Kept our README unchanged.
---

b61c3ddff8338432fdc287f6bebbf76a12859c17