Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		2019-03-14 17:17:20 +01:00
..
account_moderation_note_policy.rb
account_policy.rb
account_warning_preset_policy.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
application_policy.rb
backup_policy.rb
custom_emoji_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
domain_block_policy.rb
email_domain_block_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
instance_policy.rb
invite_policy.rb
poll_policy.rb
relay_policy.rb
report_note_policy.rb
report_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
settings_policy.rb
status_policy.rb
subscription_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
tag_policy.rb
user_policy.rb