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

…

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_spec.rb

…

status_filter_spec.rb

…

status_finder_spec.rb

…

tag_manager_spec.rb

…

user_settings_decorator_spec.rb

…

webfinger_resource_spec.rb

…