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
..
account_moderation_note_policy_spec.rb	…
account_policy_spec.rb	…
backup_policy_spec.rb	…
custom_emoji_policy_spec.rb	…
domain_block_policy_spec.rb	…
email_domain_block_policy_spec.rb	…
instance_policy_spec.rb	…
invite_policy_spec.rb	…
relay_policy_spec.rb	…
report_note_policy_spec.rb	…
report_policy_spec.rb	…
settings_policy_spec.rb	…
status_policy_spec.rb	…
tag_policy_spec.rb	…
user_policy_spec.rb	…