diff options
author | Sam Potts <sam@potts.es> | 2018-06-18 22:17:34 +1000 |
---|---|---|
committer | Sam Potts <sam@potts.es> | 2018-06-18 22:17:34 +1000 |
commit | d64ed4ba5a53547e255eda85d8ab7801298921fc (patch) | |
tree | 5652be59152169401667fa9264278a9a97c57bc6 /src/js/controls.js | |
parent | ffd864ed39340c081adb9e4a45b3c9cfe4c139e3 (diff) | |
parent | 22d524ac9d1a688d8493de0b79ff95842353e4b7 (diff) | |
download | plyr-d64ed4ba5a53547e255eda85d8ab7801298921fc.tar.lz plyr-d64ed4ba5a53547e255eda85d8ab7801298921fc.tar.xz plyr-d64ed4ba5a53547e255eda85d8ab7801298921fc.zip |
Merge branch 'develop' into a11y-improvements
# Conflicts:
# dist/plyr.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
Diffstat (limited to 'src/js/controls.js')
0 files changed, 0 insertions, 0 deletions