mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-13 15:58:50 +00:00
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper close to a glitch-soc one. Added upstream's helper.
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper close to a glitch-soc one. Added upstream's helper.