5cadb47238
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code |
||
|---|---|---|
| .. | ||
| account_batch.rb | ||
| admin_settings.rb | ||
| custom_emoji_batch.rb | ||
| delete_confirmation.rb | ||
| migration.rb | ||
| status_batch.rb | ||
| tag_batch.rb | ||
| two_factor_confirmation.rb | ||