diff options
| author | Sam Potts <sam@potts.es> | 2018-06-29 00:43:02 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-06-29 00:43:02 +1000 |
| commit | 7de9fd1d65471d54410b6a0069893a38eb1cbb22 (patch) | |
| tree | 47d6c6d997802e7d3efcad41d16d158af915084c /src/js/utils | |
| parent | ac64350a5fb658f0c9d96063a3cdb8871669cd55 (diff) | |
| parent | 566c05983233f935b2d537b4f9f682e464aab27c (diff) | |
| download | plyr-7de9fd1d65471d54410b6a0069893a38eb1cbb22.tar.lz plyr-7de9fd1d65471d54410b6a0069893a38eb1cbb22.tar.xz plyr-7de9fd1d65471d54410b6a0069893a38eb1cbb22.zip | |
Merge branch 'develop'
# Conflicts:
# changelog.md
# demo/dist/demo.css
# demo/dist/demo.js.map
# demo/dist/demo.min.js
# demo/dist/demo.min.js.map
# dist/plyr.css
# dist/plyr.js.map
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# package.json
# readme.md
# src/js/plyr.js
# src/js/plyr.polyfilled.js
Diffstat (limited to 'src/js/utils')
| -rw-r--r-- | src/js/utils/loadSprite.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/js/utils/loadSprite.js b/src/js/utils/loadSprite.js index f05795f8..917bd6ac 100644 --- a/src/js/utils/loadSprite.js +++ b/src/js/utils/loadSprite.js @@ -2,7 +2,7 @@ // Sprite loader // ========================================================================== -import Storage from './../storage'; +import Storage from '../storage'; import fetch from './fetch'; import is from './is'; |