David Yip 4cca1d1e7e Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb		2017-12-30 17:20:07 -06:00
..
activitypub
ostatus
settings
activity_tracker.rb	Add more instance stats APIs (#6125)	2017-12-29 19:52:04 +01:00
application_extension.rb
delivery_failure_tracker.rb
exceptions.rb
extractor.rb
feed_manager.rb
formatter.rb
frontmatter_handler.rb
hash_object.rb
inline_renderer.rb
language_detector.rb	Improve language filter (#5724)	2017-11-16 13:51:38 +01:00
provider_discovery.rb	Fix XML oEmbed support discovery (#6104)	2017-12-27 03:29:49 +01:00
request.rb	Using double splat operator (#5859)	2017-12-06 11:41:57 +01:00
sanitize_config.rb
status_filter.rb	Do not hide statuses from silenced accounts from other silenced accounts (#6030)	2017-12-15 01:54:05 +01:00
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	Screenshot support for themes	2017-12-10 20:32:28 -08:00
user_settings_decorator.rb
webfinger_resource.rb