You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
account_moderation_notes_controller.rb	…
accounts_controller.rb	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)	7 years ago
action_logs_controller.rb	…
base_controller.rb	Add “public” pack to admin controller, as it is included in upstream admin layout	7 years ago
change_emails_controller.rb	Feature: Allow staff to change user emails (#7074)	7 years ago
confirmations_controller.rb	…
custom_emojis_controller.rb	…
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	…
instances_controller.rb	…
invites_controller.rb	…
report_notes_controller.rb	Feature: Improve reports ui (#7032)	7 years ago
reported_statuses_controller.rb	Improve report layout (#7188)	7 years ago
reports_controller.rb	Improve report layout (#7188)	7 years ago
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	…
silences_controller.rb	…
statuses_controller.rb	Prevent admins and moderators eavesdropping in private and direct toots (#7067)	7 years ago
subscriptions_controller.rb	…
suspensions_controller.rb	…
two_factor_authentications_controller.rb	…