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	Improve report layout (#7188)	7 years ago
settings	Set up /settings/keyword_mutes. #164.	7 years ago
application_helper.rb	Improve report layout (#7188)	7 years ago
flashes_helper.rb	Clean up flash display in views (#2336)	8 years ago
home_helper.rb	Improve initialState loading	8 years ago
instance_helper.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	7 years ago
jsonld_helper.rb	Slightly reduce RAM usage (#7301)	7 years ago
mailer_helper.rb	HTML e-mails for UserMailer (#6256)	7 years ago
routing_helper.rb	Fallback default thumbnail in instance status API (#6177)	7 years ago
settings_helper.rb	Add el and te (#7332)	7 years ago
stream_entries_helper.rb	Add RSS feeds for end-users (#7259)	7 years ago