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		2018-05-03 17:23:44 -05:00
..
activitypub	…
pubsubhubbub	…
account_search_service_spec.rb	…
after_block_service_spec.rb	…
authorize_follow_service_spec.rb	…
batched_remove_status_service_spec.rb	…
block_domain_from_account_service_spec.rb	…
block_domain_service_spec.rb	…
block_service_spec.rb	…
bootstrap_timeline_service_spec.rb	…
fan_out_on_write_service_spec.rb	…
favourite_service_spec.rb	…
fetch_atom_service_spec.rb	…
fetch_link_card_service_spec.rb	…
fetch_oembed_service_spec.rb	…
fetch_remote_account_service_spec.rb	…
fetch_remote_status_service_spec.rb	…
follow_service_spec.rb	…
mute_service_spec.rb	…
notify_service_spec.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
post_status_service_spec.rb	…
precompute_feed_service_spec.rb	…
process_feed_service_spec.rb	…
process_interaction_service_spec.rb	…
process_mentions_service_spec.rb	…
reblog_service_spec.rb	…
reject_follow_service_spec.rb	…
remove_status_service_spec.rb	…
report_service_spec.rb	…
resolve_account_service_spec.rb	…
resolve_url_service_spec.rb	…
search_service_spec.rb	…
send_interaction_service_spec.rb	…
subscribe_service_spec.rb	…
suspend_account_service_spec.rb	…
unblock_domain_service_spec.rb	…
unblock_service_spec.rb	…
unfollow_service_spec.rb	…
unmute_service_spec.rb	…
unsubscribe_service_spec.rb	…
update_remote_profile_service_spec.rb	…