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 aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml		5 years ago
..
activitypub	…
ostatus	…
proof_provider/keybase	…
settings	…
delivery_failure_tracker_spec.rb	…
extractor_spec.rb	…
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
formatter_spec.rb	…
hash_object_spec.rb	…
language_detector_spec.rb	…
request_spec.rb	…
sanitize_config_spec.rb	…
status_filter_spec.rb	…
status_finder_spec.rb	…
tag_manager_spec.rb	…
user_settings_decorator_spec.rb	…
webfinger_resource_spec.rb	…