Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system		2019-05-10 17:09:12 +02:00
..
activitypub	Prevent silenced local users from notifying remote users not following them (#10575)	2019-05-09 22:05:43 +02:00
ostatus
proof_provider/keybase	Fix Keybase verification using wrong domain for remote accounts (#10547)	2019-04-10 20:28:43 +02:00
settings
delivery_failure_tracker_spec.rb
extractor_spec.rb
feed_manager_spec.rb
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
request_spec.rb
status_filter_spec.rb
status_finder_spec.rb
tag_manager_spec.rb
user_settings_decorator_spec.rb
webfinger_resource_spec.rb