diff options
| author | Sam Potts <sam@potts.es> | 2018-06-11 16:54:20 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-06-11 16:54:20 +1000 |
| commit | 3fad6ed42cfa77740fbe17ca61a5c5a106a73578 (patch) | |
| tree | 2479d6d174ab910fc0475ce9b3723e3d6634f65a /src/js/ui.js | |
| parent | 38f10d4cc67b3109189699f7e65189a852064236 (diff) | |
| parent | 38f954ef179d559095eeca5cbd5fd08fae211d34 (diff) | |
| download | plyr-3fad6ed42cfa77740fbe17ca61a5c5a106a73578.tar.lz plyr-3fad6ed42cfa77740fbe17ca61a5c5a106a73578.tar.xz plyr-3fad6ed42cfa77740fbe17ca61a5c5a106a73578.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
# src/js/captions.js
Diffstat (limited to 'src/js/ui.js')
0 files changed, 0 insertions, 0 deletions