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
..
admin	Add moderation note (#5240)	7 years ago
settings	Set up /settings/keyword_mutes. #164.	7 years ago
application_helper_spec.rb	…
flashes_helper_spec.rb	…
home_helper_spec.rb	Fix locale related specs (#3707)	8 years ago
instance_helper_spec.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	7 years ago
jsonld_helper_spec.rb	Append '.test' to hostname in stub data (#7260)	7 years ago
routing_helper_spec.rb	Use URI.join even when S3 enabled (#4652)	7 years ago
settings_helper_spec.rb	Fix language filter codes (#4841)	7 years ago
stream_entries_helper_spec.rb	Remove empty strings (#5732)	7 years ago