Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
22cfab0ebf9fb02aee3c2ff42d78b30781e9264d
mastodon/app/controllers/settings/two_factor_authentication
History
Claire e25cc4deb7 Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.
2023-10-24 19:31:14 +02:00
..
confirmations_controller.rb
Refactor settings controllers (#14767)
2020-09-11 20:56:35 +02:00
otp_authentication_controller.rb
Remove unused methods in 2FA OTP Auth Controller (#24220)
2023-04-07 14:13:53 +02:00
recovery_codes_controller.rb
Refactor settings controllers (#14767)
2020-09-11 20:56:35 +02:00
webauthn_credentials_controller.rb
Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
2023-10-24 19:31:14 +02:00