mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 03:43:08 +00:00
abfdafef1e
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. |
||
---|---|---|
.. | ||
challenges_controller.rb | ||
confirmations_controller.rb | ||
omniauth_callbacks_controller.rb | ||
passwords_controller.rb | ||
registrations_controller.rb | ||
sessions_controller.rb | ||
setup_controller.rb |