This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		2019-08-19 21:49:35 +02:00
..
activitypub	…
connection_pool	…
ostatus	…
proof_provider	…
settings	…
activity_tracker.rb	…
application_extension.rb	…
delivery_failure_tracker.rb	…
entity_cache.rb	…
exceptions.rb	…
extractor.rb	…
fast_geometry_parser.rb	…
feed_manager.rb	…
formatter.rb	…
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	…
potential_friendship_tracker.rb	…
proof_provider.rb	…
request.rb	…
request_pool.rb	…
rss_builder.rb	…
sanitize_config.rb	…
search_query_parser.rb	…
search_query_transformer.rb	…
sidekiq_error_handler.rb	…
spam_check.rb	…
status_filter.rb	…
status_finder.rb	…
tag_manager.rb	…
themes.rb	…
user_settings_decorator.rb	…
webfinger_resource.rb	…