Thibaut Girka 0ae7d84273 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`

2019-11-06 14:38:28 +01:00

..

activitypub

…

connection_pool

…

ostatus

…

proof_provider/keybase

…

settings

…

delivery_failure_tracker_spec.rb

…

extractor_spec.rb

…

feed_manager_spec.rb

…

formatter_spec.rb

…

hash_object_spec.rb

…

language_detector_spec.rb

…

request_pool_spec.rb

…

request_spec.rb

…

sanitize_config_spec.rb

…

spam_check_spec.rb

…

status_filter_spec.rb

…

status_finder_spec.rb

…

tag_manager_spec.rb

…

user_settings_decorator_spec.rb

…

webfinger_resource_spec.rb

…