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	Handle stream_entry URL correctly in ActivityPub (#4854)	2017-09-08 18:20:03 +02:00
ostatus	Switch to static URIs, new URI format in both protocols for new statuses (#4815)	2017-09-06 19:01:28 +02:00
settings
application_extension.rb
emoji.rb
exceptions.rb
extractor.rb
feed_manager.rb
formatter.rb
frontmatter_handler.rb
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
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	Switch to static URIs, new URI format in both protocols for new statuses (#4815)	2017-09-06 19:01:28 +02:00
user_settings_decorator.rb
webfinger_resource.rb