Updated from tootsuite

2017-07-17 20:03:57 +02:00
parent d0aad1ac85 681c33d1f4
commit c727eae441
34 changed files with 221 additions and 29 deletions
--- 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();
--- 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);