Merge remote-tracking branch 'upstream/master'

diff --cc app/javascript/mastodon/features/status/index.js
Simple merge

diff --cc app/views/home/index.html.haml
Simple merge

diff --cc app/views/layouts/application.html.haml
index e6190f7e2a743b312a46975cb6fb1c4e032e24fb,ee995c987e890de1531104c0716c9a7fa22e374b..24b74c787c073c5ae25ac4a51d3c2c424c5be99d
--- 1/app/views/layouts/application.html.haml
--- 2/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@@ -19,15 -19,8 +19,7 @@@
        = title
  
      = stylesheet_pack_tag 'common', media: 'all'
 -    = stylesheet_pack_tag current_theme, media: 'all'
      = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
- 
-     %link{ href: asset_pack_path('features/getting_started.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
-     %link{ href: asset_pack_path('features/compose.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
-     %link{ href: asset_pack_path('features/home_timeline.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
-     %link{ href: asset_pack_path('features/notifications.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
-     %link{ href: asset_pack_path('features/community_timeline.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
-     %link{ href: asset_pack_path('features/public_timeline.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
- 
      = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
      = csrf_meta_tags