diff options
| author | Sam Potts <me@sampotts.me> | 2018-01-07 22:39:28 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2018-01-07 22:39:28 +1100 |
| commit | 2b36ab7ef53c3c2cc20651f2aff4cf145a8a17df (patch) | |
| tree | 0188122e74daff8ebac51ca45fd87c77457cd3bf /src/js/controls.js | |
| parent | eb38e0394d7ad95f3039ad88f9f564f3a9703503 (diff) | |
| parent | b79ffacd9c44168fa84c236689deca1c57a22c7b (diff) | |
| download | plyr-2b36ab7ef53c3c2cc20651f2aff4cf145a8a17df.tar.lz plyr-2b36ab7ef53c3c2cc20651f2aff4cf145a8a17df.tar.xz plyr-2b36ab7ef53c3c2cc20651f2aff4cf145a8a17df.zip | |
Merge branch 'master' into develop
# Conflicts:
# .vscode/settings.json
# demo/dist/demo.css
# demo/dist/demo.js
# demo/error.html
# demo/index.html
# demo/src/js/main.js
# demo/src/less/lib/fontface.less
# dist/plyr.css
# dist/plyr.js
# gulpfile.js
# package-lock.json
# package.json
# readme.md
# src/js/plyr.js
# src/less/plyr.less
# src/scss/plyr.scss
Diffstat (limited to 'src/js/controls.js')
0 files changed, 0 insertions, 0 deletions