David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 ... Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss		2017-09-09 23:56:21 -05:00
..
activitypub
ostatus
settings
application_extension.rb
emoji.rb
exceptions.rb
extractor.rb
feed_manager.rb
formatter.rb
frontmatter_handler.rb	createBio function added	2017-06-30 15:03:31 -07:00
hash_object.rb
inline_renderer.rb
language_detector.rb	Fix language filter codes (#4841)	2017-09-08 12:32:22 +02:00
provider_discovery.rb
request.rb	Add Digest header to requests with body, handle acct and URI keyId (#4565)	2017-08-09 23:54:14 +02:00
sanitize_config.rb
status_filter.rb
status_finder.rb
tag_manager.rb
user_settings_decorator.rb
webfinger_resource.rb