Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +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	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
user_policy.rb