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 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		6 years ago
..
exports	…
two_factor_authentication	Lint pass (#8876)	6 years ago
applications_controller_spec.rb	lint pass 2 (#8878)	6 years ago
deletes_controller_spec.rb	…
exports_controller_spec.rb	…
flavours_controller_spec.rb	…
follower_domains_controller_spec.rb	…
imports_controller_spec.rb	…
migrations_controller_spec.rb	Lint pass (#8876)	6 years ago
notifications_controller_spec.rb	…
preferences_controller_spec.rb	Change language opt-out to language opt-in (#7823)	7 years ago
profiles_controller_spec.rb	…
sessions_controller_spec.rb	…
two_factor_authentications_controller_spec.rb	…