diff options
| author | Sam Potts <sam@potts.es> | 2019-06-01 19:55:14 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2019-06-01 19:55:14 +1000 |
| commit | 12c6282d14e3e06a7784760f83affc9195afed1f (patch) | |
| tree | af1c6be692c4cf2679e7efc604896b686974368d /src/js/source.js | |
| parent | 996075decc6e8c0f0c5059dccea21b16020eb78b (diff) | |
| parent | 0249772f019762ebd494ac409e597103820413c3 (diff) | |
| download | plyr-12c6282d14e3e06a7784760f83affc9195afed1f.tar.lz plyr-12c6282d14e3e06a7784760f83affc9195afed1f.tar.xz plyr-12c6282d14e3e06a7784760f83affc9195afed1f.zip | |
Merge branch 'develop' into css-variables
# Conflicts:
# .eslintrc
# demo/dist/demo.css
# demo/dist/demo.js
# demo/dist/demo.min.js
# demo/dist/demo.min.js.map
# dist/plyr.css
# dist/plyr.js
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.min.mjs
# dist/plyr.min.mjs.map
# dist/plyr.mjs
# dist/plyr.polyfilled.js
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# dist/plyr.polyfilled.min.mjs
# dist/plyr.polyfilled.min.mjs.map
# dist/plyr.polyfilled.mjs
# gulpfile.js
# package.json
Diffstat (limited to 'src/js/source.js')
0 files changed, 0 insertions, 0 deletions