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.		2018-12-23 11:28:28 +01:00
..
account_moderation_note_policy.rb
account_policy.rb
account_warning_preset_policy.rb
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
user_policy.rb