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	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
ostatus	Append '.test' to hostname in stub data (#7260)	2018-04-25 14:12:28 +02:00
settings
delivery_failure_tracker_spec.rb
extractor_spec.rb
feed_manager_spec.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-24 05:17:10 +00:00
formatter_spec.rb	Append '.test' to hostname in stub data (#7260)	2018-04-25 14:12:28 +02:00
hash_object_spec.rb
language_detector_spec.rb
request_spec.rb	Validate HTTP response length while receiving (#6891)	2018-03-26 14:02:10 +02:00
status_filter_spec.rb
status_finder_spec.rb
tag_manager_spec.rb	Append '.test' to hostname in stub data (#7260)	2018-04-25 14:12:28 +02:00
user_settings_decorator_spec.rb	Enable updating additional account information from user preferences via rest api (#6789)	2018-04-08 13:43:10 +02:00
webfinger_resource_spec.rb