David Yip 991371af5f Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: db/schema.rb		2018-01-09 14:16:45 -06:00
..
activitypub	Skip ActivityPub Announces of non-public objects (#6230)	2018-01-09 19:35:10 +01:00
ostatus	Skip ActivityPub Announces of non-public objects (#6230)	2018-01-09 19:35:10 +01:00
settings
activity_tracker.rb
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
provider_discovery.rb	Fix XML oEmbed support discovery (#6104)	2017-12-27 03:29:49 +01:00
request.rb
sanitize_config.rb
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
user_settings_decorator.rb	fixed fav setting change	2017-12-09 12:17:20 -06:00
webfinger_resource.rb