Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml		2019-06-26 23:19:22 +02:00
..
exports
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	2019-06-07 16:51:08 +02:00
two_factor_authentication
applications_controller.rb
base_controller.rb
deletes_controller.rb
exports_controller.rb
featured_tags_controller.rb
flavours_controller.rb
identity_proofs_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
imports_controller.rb
migrations_controller.rb
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00
profiles_controller.rb
sessions_controller.rb
two_factor_authentications_controller.rb