diff options
| author | Sam Potts <sam@potts.es> | 2019-01-26 16:50:37 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2019-01-26 16:50:37 +1100 |
| commit | 44739a17d0b2f4fbafa348370f7f32d179977045 (patch) | |
| tree | bd5b38494bdd3ea760ea54056340efb5c0714edf /src/js/html5.js | |
| parent | 464acd1a3636b26dba1368e4c80b603845adbc76 (diff) | |
| parent | ad72ebd4bbf487e56884d264a4bb13119fb687b5 (diff) | |
| download | plyr-44739a17d0b2f4fbafa348370f7f32d179977045.tar.lz plyr-44739a17d0b2f4fbafa348370f7f32d179977045.tar.xz plyr-44739a17d0b2f4fbafa348370f7f32d179977045.zip | |
Merge branch 'master' into develop
# Conflicts:
# changelog.md
# demo/dist/demo.js.map
# demo/dist/demo.min.js
# demo/dist/demo.min.js.map
# demo/index.html
# dist/plyr.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# package.json
# readme.md
# yarn.lock
Diffstat (limited to 'src/js/html5.js')
0 files changed, 0 insertions, 0 deletions