You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		5 years ago
..
exports	…
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	6 years ago
two_factor_authentication	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
applications_controller.rb	…
base_controller.rb	…
deletes_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
exports_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
featured_tags_controller.rb	Fix pinned statuses being shown in a featured hashtag (#9971)	6 years ago
flavours_controller.rb	…
identity_proofs_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
imports_controller.rb	…
migrations_controller.rb	…
preferences_controller.rb	Add option to disable real-time updates in web UI (#9984)	5 years ago
profiles_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
sessions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
two_factor_authentications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago