mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 11:11:11 +02:00
Conflicts: - `app/helpers/theme_helper.rb`: Upstream added a helper to insert javascript tags, close to where we had modified code. Ported upstream's change.