Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +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	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
formatter.rb
hash_object.rb
inline_renderer.rb
language_detector.rb
potential_friendship_tracker.rb
proof_provider.rb
request.rb
rss_builder.rb	Add RSS feeds for end-users (#7259)	2018-04-25 02:10:02 +02:00
sanitize_config.rb
sidekiq_error_handler.rb	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)	2018-02-24 19:16:11 +01:00
status_filter.rb
status_finder.rb	Raise an error for remote url in StatusFinder (#4776)	2017-09-02 17:42:47 +02:00
tag_manager.rb
themes.rb	Allow selecting both default flavour and theme	2018-10-12 19:06:35 +02:00
user_settings_decorator.rb
webfinger_resource.rb