Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml		2019-03-28 13:01:33 +01:00
..
activitypub	Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)	2019-03-28 04:44:59 +01:00
ostatus
proof_provider/keybase	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
settings
delivery_failure_tracker_spec.rb
extractor_spec.rb
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
formatter_spec.rb	Fix URL linkifier grabbing full-width spaces and quotations (#9997)	2019-02-09 20:13:11 +01:00
hash_object_spec.rb
language_detector_spec.rb	Fix language detection of non-latin alphabets even at few characters (#10276)	2019-03-15 05:07:09 +01:00
request_spec.rb	Fix connect timeout not being enforced (#9329)	2018-11-22 20:12:04 +01:00
status_filter_spec.rb
status_finder_spec.rb
tag_manager_spec.rb
user_settings_decorator_spec.rb
webfinger_resource_spec.rb