|
|
aae1092bac
|
Merge branch 'develop' of github.com:sampotts/plyr into develop
# Conflicts:
# src/js/captions.js
# src/js/controls.js
# src/js/fullscreen.js
# src/js/html5.js
# src/js/listeners.js
# src/js/plugins/youtube.js
# src/js/plyr.js
# src/js/utils.js
|
2018-06-13 00:41:30 +10:00 |
|
