From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 17 Mar 2022 18:23:39 +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=4e3c68e0256e6aab4bb30f350dac4fc4386cb0b9;p=mastodon.git

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

Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream fixed an issue that glitch-soc did not have, in a place with
  glitch-soc changes to hide the number of followers.
  Kept glitch-soc's code.
---

4e3c68e0256e6aab4bb30f350dac4fc4386cb0b9