diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-16 15:46:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 15:46:12 -0500 |
| commit | 7c44ad63550ccf3cb7532440f79196b20dc24c5d (patch) | |
| tree | fb5d8ed08dc130607fd7fd31c67b7cad4ebfd8f5 /app/javascript/themes/spin | |
| parent | 6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (diff) | |
| parent | 37ff061d9bf0a91da6580960be01e3c6bc5e5c4c (diff) | |
Merge pull request #181 from glitch-soc/upstream-merge-again
Merge upstream, pull in fixes for tootsuite/mastodon#{5409,5417}Diffstat (limited to 'app/javascript/themes/spin')
| -rw-r--r-- | app/javascript/themes/spin/pack.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/themes/spin/pack.js b/app/javascript/themes/spin/pack.js index dab0e93a4..b11ac4802 100644 --- a/app/javascript/themes/spin/pack.js +++ b/app/javascript/themes/spin/pack.js @@ -1,2 +1,2 @@ -import 'packs/application'; -import 'themes/spin/style'; +import '../../packs/application'; +import './style.scss'; |