mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-07 07:22:49 -05:00
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper, while glitch-soc had extra helpers. Added upstream's helper.
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper, while glitch-soc had extra helpers. Added upstream's helper.