diff options
| author | Sam Potts <sam@potts.es> | 2018-06-18 23:29:25 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-06-18 23:29:25 +1000 |
| commit | 715b88c09b17f04dcdfab9bcf87a16ec814ea1fb (patch) | |
| tree | 4d12c042cc26c94706260682641f71d81faa3137 /src/js/controls.js | |
| parent | 7b9ef7d757811cb7c855856ef091061d315b13c4 (diff) | |
| parent | ea4d91d2a011cdfc835619cb90a25074c039e777 (diff) | |
| download | plyr-715b88c09b17f04dcdfab9bcf87a16ec814ea1fb.tar.lz plyr-715b88c09b17f04dcdfab9bcf87a16ec814ea1fb.tar.xz plyr-715b88c09b17f04dcdfab9bcf87a16ec814ea1fb.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