mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-20 06:33:05 -05:00
18556d3e9b
Conflicts: - `app/helpers/application_helper.rb`: Upstream refactored some helpers and moved them in another file. Not a real conflict, but glitch-soc had adjacent glitch-only definitions. Kept glitch-soc definitions where they are and moved upstream ones as upstream did.