diff options
author | Sam Potts <sam@potts.es> | 2018-06-19 19:24:47 +1000 |
---|---|---|
committer | Sam Potts <sam@potts.es> | 2018-06-19 19:24:47 +1000 |
commit | bb546fe43fc6537a4dc0a350a7aa4260a3f97b1d (patch) | |
tree | b70095eb74061a7a4089ecc043c0e4b27c0f934b /src/js/controls.js | |
parent | 9e1218547b18e87921d0bd95d259cac4fe538c61 (diff) | |
parent | 52ea5bd0ab211cc18e7d1f6de06a78d805a94b62 (diff) | |
download | plyr-bb546fe43fc6537a4dc0a350a7aa4260a3f97b1d.tar.lz plyr-bb546fe43fc6537a4dc0a350a7aa4260a3f97b1d.tar.xz plyr-bb546fe43fc6537a4dc0a350a7aa4260a3f97b1d.zip |
Merge branch 'develop' into a11y-improvements
# Conflicts:
# dist/plyr.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
Diffstat (limited to 'src/js/controls.js')
0 files changed, 0 insertions, 0 deletions