mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 05:39:02 +09:00
e25cc4deb7
Conflicts: - `config/navigation.rb`: Conflict due to glitch-soc having extra navigation items for its theming system. Ported upstream changes. |
||
---|---|---|
.. | ||
challenges_controller.rb | ||
confirmations_controller.rb | ||
omniauth_callbacks_controller.rb | ||
passwords_controller.rb | ||
registrations_controller.rb | ||
sessions_controller.rb | ||
setup_controller.rb |