diff options
| author | Sam Potts <sam@potts.es> | 2018-07-30 23:09:12 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-07-30 23:09:12 +1000 |
| commit | dae272ef66a967ed23a2fe48cf68b0273349b89e (patch) | |
| tree | 96d88efe747478262e9ac02c775e7b62f3162157 /src/js/ui.js | |
| parent | 599b33e55fb4c0aec78cd0895bcd13f3fed12ad2 (diff) | |
| parent | 2679c5898edd534d19b5b2f68d895641c3e3fb1a (diff) | |
| download | plyr-dae272ef66a967ed23a2fe48cf68b0273349b89e.tar.lz plyr-dae272ef66a967ed23a2fe48cf68b0273349b89e.tar.xz plyr-dae272ef66a967ed23a2fe48cf68b0273349b89e.zip | |
Merge branch 'develop' into a11y-improvements
# Conflicts:
# demo/dist/demo.css
# dist/plyr.css
# 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
# package.json
# src/js/plyr.js
Diffstat (limited to 'src/js/ui.js')
0 files changed, 0 insertions, 0 deletions