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	…
accounts	Feature: add count of account notes to reports (#7130)	7 years ago
action_logs	Improve report layout (#7188)	7 years ago
change_emails	Feature: Allow staff to change user emails (#7074)	7 years ago
custom_emojis	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	7 years ago
domain_blocks	…
email_domain_blocks	…
instances	…
invites	Add invite filter (#5862)	7 years ago
report_notes	Improve report layout (#7188)	7 years ago
reports	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
settings	Redesign landing page (again) (#6486)	7 years ago
statuses	Finalized theme loading and stuff	7 years ago
subscriptions	…