about summary refs log tree commit diff
path: root/app/javascript/packs
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-07-17 20:03:57 +0200
committerOndřej Hruška <ondra@ondrovo.com>2017-07-17 20:03:57 +0200
commitc727eae4412ac9e4f1bafdc68fe89dcd46d602ca (patch)
treeee7ce8662f6a91c87cf46bf6de70dae66556c0d0 /app/javascript/packs
parentd0aad1ac854eaa53f9b7d38cc8dd90e289790629 (diff)
parent681c33d1f4c395742918eb66f2db979b0d628118 (diff)
Updated from tootsuite
Diffstat (limited to 'app/javascript/packs')
-rw-r--r--app/javascript/packs/common.js2
-rw-r--r--app/javascript/packs/public.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
index a0cb91ae4..ba7053f1f 100644
--- a/app/javascript/packs/common.js
+++ b/app/javascript/packs/common.js
@@ -4,4 +4,6 @@ import { start } from 'rails-ujs';
 require('font-awesome/css/font-awesome.css');
 require('mastodon-application-style');
 
+require.context('../images/', true);
+
 start();
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 4865f3ec0..39daef761 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -7,8 +7,6 @@ import loadPolyfills from '../mastodon/load_polyfills';
 import { processBio } from '../glitch/util/bio_metadata';
 import ready from '../mastodon/ready';
 
-require.context('../images/', true);
-
 const { localeData } = getLocale();
 localeData.forEach(IntlRelativeFormat.__addLocaleData);