diff options
| author | Sam Potts <sam@potts.es> | 2018-06-09 17:03:16 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-06-09 17:03:16 +1000 |
| commit | 7c6d4666e99f1604c28c57bec12f16bd0fb7e79c (patch) | |
| tree | 2b5e3288defe5760694fe1096cc1d9c3490f3118 /src/js/utils | |
| parent | 90c5735904354f5fde0dcdae9f8894fe9088739c (diff) | |
| parent | 76bb299c68a6b5cc72729771aca2f0d51078ebc5 (diff) | |
| download | plyr-7c6d4666e99f1604c28c57bec12f16bd0fb7e79c.tar.lz plyr-7c6d4666e99f1604c28c57bec12f16bd0fb7e79c.tar.xz plyr-7c6d4666e99f1604c28c57bec12f16bd0fb7e79c.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
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# src/js/captions.js
# src/js/plyr.js
Diffstat (limited to 'src/js/utils')
0 files changed, 0 insertions, 0 deletions