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 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.		6 years ago
..
account_moderation_note_policy.rb	…
account_policy.rb	Add moderation warnings (#9519)	6 years ago
account_warning_preset_policy.rb	Add moderation warnings (#9519)	6 years ago
application_policy.rb	…
backup_policy.rb	…
custom_emoji_policy.rb	…
domain_block_policy.rb	…
email_domain_block_policy.rb	…
instance_policy.rb	…
invite_policy.rb	…
relay_policy.rb	…
report_note_policy.rb	…
report_policy.rb	…
settings_policy.rb	…
status_policy.rb	…
subscription_policy.rb	…
tag_policy.rb	Add profile directory (#9427)	6 years ago
user_policy.rb	…