diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-16 09:23:59 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-10-16 09:23:59 -0500 |
| commit | dbb1fce94dbd877d795898933ca344359f9b74c1 (patch) | |
| tree | 06ab5f2ae7714b41aa9e5cc19ac8c234e0f394be /app/javascript/packs | |
| parent | 6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (diff) | |
| parent | aec70b44fc551db6471c8bc5210688b154ac661f (diff) | |
Merge remote-tracking branch 'upstream/master' into gs-master
Diffstat (limited to 'app/javascript/packs')
| -rw-r--r-- | app/javascript/packs/common.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js index de0c68fa5..cb47514d3 100644 --- a/app/javascript/packs/common.js +++ b/app/javascript/packs/common.js @@ -1,6 +1,8 @@ import { start } from 'rails-ujs'; +import 'font-awesome/css/font-awesome.css'; // import common styling require('../styles/common.scss'); +require.context('../images/', true); start(); |