mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-14 11:43:05 -05:00
4e3c68e025
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.