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.

Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		5 years ago
..
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	…