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	Export and import show_reblogs together with following list (#10495)	6 years ago
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	6 years ago
two_factor_authentication	…
applications_controller_spec.rb	lint pass 2 (#8878)	6 years ago
deletes_controller_spec.rb	Change unconfirmed user login behaviour (#11375)	5 years ago
exports_controller_spec.rb	Add spec for Settings::ExportsController#create (#9512)	6 years ago
flavours_controller_spec.rb	…
identity_proofs_controller_spec.rb	compare usernames case-insensitively on new proof creation flow (#10544)	6 years ago
imports_controller_spec.rb	…
migrations_controller_spec.rb	…
profiles_controller_spec.rb	Error message for avatar image that's too large. #9204 (#9518)	6 years ago
sessions_controller_spec.rb	…
two_factor_authentications_controller_spec.rb	…