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

…

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

…

poll_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

…