David Yip c816701550 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml		2018-05-03 17:23:44 -05:00
..
account_moderation_note_policy.rb
account_policy.rb	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)	2018-04-02 13:45:07 +02: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
instance_policy.rb
invite_policy.rb
report_note_policy.rb	Feature: Report improvements (#6967) (#7000)	2018-04-02 22:04:14 +02:00
report_policy.rb
settings_policy.rb
status_policy.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
subscription_policy.rb
user_policy.rb	Feature: Allow staff to change user emails (#7074)	2018-04-10 09:16:06 +02:00