Claire f60c99a8fb Merge branch 'main' into glitch-soc/merge-upstream		2021-03-24 10:53:50 +01:00
..
exports	Add import/export feature for bookmarks (#14956)	2020-11-19 17:48:13 +01:00
preferences
two_factor_authentication	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
applications_controller_spec.rb
deletes_controller_spec.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
exports_controller_spec.rb
featured_tags_controller_spec.rb
flavours_controller_spec.rb
identity_proofs_controller_spec.rb
imports_controller_spec.rb	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
migrations_controller_spec.rb	Fix race conditions on account migration creation (#15597)	2021-02-02 14:49:57 +01:00
profiles_controller_spec.rb	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
sessions_controller_spec.rb
two_factor_authentication_methods_controller_spec.rb