Conflicts: - `config/navigation.rb`: Conflict due to glitch-soc having extra navigation items for its theming system. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| confirmations_controller.rb | ||
| otp_authentication_controller.rb | ||
| recovery_codes_controller.rb | ||
| webauthn_credentials_controller.rb | ||