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
..
exports	…
two_factor_authentication	…
applications_controller_spec.rb	…
deletes_controller_spec.rb	…
exports_controller_spec.rb	…
flavours_controller_spec.rb	…
follower_domains_controller_spec.rb	…
imports_controller_spec.rb	…
keyword_mutes_controller_spec.rb	…
notifications_controller_spec.rb	…
preferences_controller_spec.rb	…
profiles_controller_spec.rb	…
two_factor_authentications_controller_spec.rb	…