From: Ondřej Hruška <ondra@ondrovo.com>
Date: Wed, 11 Oct 2017 19:27:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0bf9261e65b08cb54f43303c20d693649e16c079;p=mastodon.git

Merge remote-tracking branch 'upstream/master'
---

0bf9261e65b08cb54f43303c20d693649e16c079
diff --cc app/views/layouts/application.html.haml
index e6190f7e2,ee995c987..24b74c787
--- a/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