mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-05 14:33:05 -05:00
Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.