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	…
otp_authentication_controller.rb	…
recovery_codes_controller.rb	…
webauthn_credentials_controller.rb	Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream	2023-10-24 19:31:14 +02:00