Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
account_moderation_note_policy.rb
account_policy.rb
account_warning_preset_policy.rb
announcement_policy.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
application_policy.rb
backup_policy.rb
custom_emoji_policy.rb
domain_allow_policy.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
tag_policy.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	2019-08-05 19:54:29 +02:00
user_policy.rb