Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.		2020-01-04 23:04:42 +01:00
..
exports
migration
preferences
two_factor_authentication	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
aliases_controller.rb
applications_controller.rb
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
deletes_controller.rb
exports_controller.rb
featured_tags_controller.rb
flavours_controller.rb
identity_proofs_controller.rb
imports_controller.rb
migrations_controller.rb
preferences_controller.rb
profiles_controller.rb
sessions_controller.rb
two_factor_authentications_controller.rb