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.
mastodon/app/lib
Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
2019-06-10 18:59:53 +02:00
..
activitypub
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
rss_builder.rb
sanitize_config.rb
sidekiq_error_handler.rb
status_filter.rb
status_finder.rb
tag_manager.rb
themes.rb
user_settings_decorator.rb
webfinger_resource.rb