Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency. |
||
|---|---|---|
| .. | ||
| confirmations_controller.rb | ||
| otp_authentication_controller.rb | ||
| recovery_codes_controller.rb | ||
| webauthn_credentials_controller.rb | ||