From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 22 Mar 2022 16:00:38 +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=59864ff495cb607b4e2632b8b8ca183c1e602626;p=mastodon.git

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

Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
---

59864ff495cb607b4e2632b8b8ca183c1e602626