diff options
author | Sam Potts <sam@potts.es> | 2018-06-17 01:26:24 +1000 |
---|---|---|
committer | Sam Potts <sam@potts.es> | 2018-06-17 01:26:24 +1000 |
commit | f1b4db4f3665ea824ad75d7b68df1efc9f1a0524 (patch) | |
tree | d3fd6d76a15a94f8a5889b3d0033c65b35420c4f /src/js/plyr.polyfilled.js | |
parent | 6a6f3914c0943c72a85c290a8175d759e7f70809 (diff) | |
parent | d4abb4b1438cb316aacae480e7b7e9b055a60b24 (diff) | |
download | plyr-f1b4db4f3665ea824ad75d7b68df1efc9f1a0524.tar.lz plyr-f1b4db4f3665ea824ad75d7b68df1efc9f1a0524.tar.xz plyr-f1b4db4f3665ea824ad75d7b68df1efc9f1a0524.zip |
Merge branch 'develop' into a11y-improvements
# Conflicts:
# dist/plyr.js
# 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
# src/js/controls.js
# src/js/fullscreen.js
# src/js/plyr.js
# src/js/ui.js
# src/js/utils.js
Diffstat (limited to 'src/js/plyr.polyfilled.js')
0 files changed, 0 insertions, 0 deletions