Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.		2018-08-24 15:10:34 +02:00
..
account_moderation_note_policy.rb
account_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	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02:00
relay_policy.rb
report_note_policy.rb
report_policy.rb
settings_policy.rb
status_policy.rb
subscription_policy.rb
user_policy.rb	Allow mods to disable login, improve message when login disabled (#8329)	2018-08-23 23:26:29 +02:00