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

Don't normalize URLs in toots (#6134)

2018-01-03 20:51:33 +01:00

frontmatter_handler.rb

…

hash_object.rb

…

inline_renderer.rb

…

language_detector.rb

…

provider_discovery.rb

…

request.rb

…

sanitize_config.rb

…

status_filter.rb

…

status_finder.rb

…

tag_manager.rb

…

themes.rb

…

user_settings_decorator.rb

…

webfinger_resource.rb

…