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 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml		6 years ago
..
activitypub	Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)	6 years ago
ostatus	rubocop issues - Cleaning up (#8912)	6 years ago
proof_provider/keybase	…
settings	Add a test for Settings::Extend#settings (#5720)	7 years ago
delivery_failure_tracker_spec.rb	…
extractor_spec.rb	…
feed_manager_spec.rb	…
formatter_spec.rb	…
hash_object_spec.rb	…
language_detector_spec.rb	…
request_spec.rb	…
status_filter_spec.rb	…
status_finder_spec.rb	…
tag_manager_spec.rb	…
user_settings_decorator_spec.rb	…
webfinger_resource_spec.rb	…