diff options
| author | Surinna Curtis <ekiru.0@gmail.com> | 2017-11-16 01:21:16 -0600 |
|---|---|---|
| committer | Surinna Curtis <ekiru.0@gmail.com> | 2017-11-16 01:21:16 -0600 |
| commit | 35fbdc36f92b610e8a73e2acb220e87cf5fc83b0 (patch) | |
| tree | fcd9bdb5ba49ab7a6a79590c74db858ae77b4239 /app/javascript/packs/common.js | |
| parent | 30237259367a0ef2b20908518b86bbeb358999b5 (diff) | |
| parent | 88627fd7aa2493a6890d60a5965459e4c7fe6fe9 (diff) | |
Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5
Diffstat (limited to 'app/javascript/packs/common.js')
| -rw-r--r-- | app/javascript/packs/common.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js index 96e6f4b16..5ac6504d4 100644 --- a/app/javascript/packs/common.js +++ b/app/javascript/packs/common.js @@ -1,6 +1,9 @@ import { start } from 'rails-ujs'; import 'font-awesome/css/font-awesome.css'; +// import common styling +require('../styles/common.scss'); + require.context('../images/', true); start(); |