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 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		5 years ago
..
account_moderation_note_policy.rb	…
account_policy.rb	…
account_warning_preset_policy.rb	…
announcement_policy.rb	…
application_policy.rb	…
backup_policy.rb	…
custom_emoji_policy.rb	…
domain_allow_policy.rb	…
domain_block_policy.rb	…
email_domain_block_policy.rb	…
instance_policy.rb	…
invite_policy.rb	…
poll_policy.rb	…
relay_policy.rb	…
report_note_policy.rb	…
report_policy.rb	…
settings_policy.rb	…
status_policy.rb	…
tag_policy.rb	…
user_policy.rb	…