diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:20:59 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:20:59 +0200 |
| commit | daad07b1d552d5af06b4d8443afdbe1350785a14 (patch) | |
| tree | 4062f211cd6e307a5bbb7c338263f366a9fafade /app/javascript/packs/application.js | |
| parent | 83bda6c1a813c5aeb131b18a0500fed0c07fa9c2 (diff) | |
| parent | f7ca205f382a9d528bf37e3ec38ee8bf77dccccf (diff) | |
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
Diffstat (limited to 'app/javascript/packs/application.js')
| -rw-r--r-- | app/javascript/packs/application.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index c06714dc1..aa94006c6 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -2,7 +2,7 @@ import loadPolyfills from '../mastodon/load_polyfills'; // import default stylesheet with variables require('font-awesome/css/font-awesome.css'); -require('mastodon-application-style'); +import 'styles/application'; require.context('../images/', true); |