mirror of
https://github.com/funamitech/mastodon
synced 2024-12-02 16:58:53 +09:00
1c448d6474
Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream. |
||
|---|---|---|
| .. | ||
| confirmations_controller.rb | ||
| omniauth_callbacks_controller.rb | ||
| passwords_controller.rb | ||
| registrations_controller.rb | ||
| sessions_controller.rb | ||