diff options
| author | Sam Potts <sam@potts.es> | 2019-06-20 23:56:19 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2019-06-20 23:56:19 +1000 |
| commit | e8e2b8ba397887bae16ac39dc001503380c4dd68 (patch) | |
| tree | bf7e5e719cfa7112f1ff0c2e156ec2233c6ab649 /src/js/controls.js | |
| parent | 2e40b91ec1aabf33e945cba66fbcdd9b7aa53ba7 (diff) | |
| parent | 1e761e237aceb49b29291946a39eef958d6da966 (diff) | |
| download | plyr-e8e2b8ba397887bae16ac39dc001503380c4dd68.tar.lz plyr-e8e2b8ba397887bae16ac39dc001503380c4dd68.tar.xz plyr-e8e2b8ba397887bae16ac39dc001503380c4dd68.zip | |
Merge branch 'master' into develop
# 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
# package.json
# readme.md
# src/js/listeners.js
# yarn.lock
Diffstat (limited to 'src/js/controls.js')
0 files changed, 0 insertions, 0 deletions