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 e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		7 years ago
..
activitypub	Resolve unknown status from Add activity, skip Remove if unknown (#7526)	7 years ago
ostatus	Append '.test' to hostname in stub data (#7260)	7 years ago
settings	…
delivery_failure_tracker_spec.rb	…
extractor_spec.rb	…
feed_manager_spec.rb	…
formatter_spec.rb	Append '.test' to hostname in stub data (#7260)	7 years ago
hash_object_spec.rb	…
language_detector_spec.rb	…
request_spec.rb	…
status_filter_spec.rb	…
status_finder_spec.rb	…
tag_manager_spec.rb	Append '.test' to hostname in stub data (#7260)	7 years ago
user_settings_decorator_spec.rb	…
webfinger_resource_spec.rb	…