David Yip f61aa8e0f7 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb		2018-03-27 10:26:47 -05:00
..
activitypub
ostatus
settings
delivery_failure_tracker_spec.rb
extractor_spec.rb
feed_manager_spec.rb
formatter_spec.rb
hash_object_spec.rb
language_detector_spec.rb
provider_discovery_spec.rb	A minor change for ProviderDiscovery and spec (#3543)	2017-06-04 14:59:40 +02:00
request_spec.rb
status_filter_spec.rb
status_finder_spec.rb	Raise an error for remote url in StatusFinder (#4776)	2017-09-02 17:42:47 +02:00
tag_manager_spec.rb
user_settings_decorator_spec.rb
webfinger_resource_spec.rb