Sam Potts b7b2e3c0aa Merge branch 'develop' into css-variables ...

# Conflicts:
#	demo/dist/demo.css
#	demo/dist/demo.js
#	demo/dist/demo.js.map
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.css
#	dist/plyr.js
#	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
#	gulpfile.js
#	src/sass/components/captions.scss
#	src/sass/components/control.scss

2018-11-11 11:05:09 +11:00

..

demo.css

Merge branch 'develop' into css-variables

2018-11-11 11:05:09 +11:00

demo.js

v3.4.4

2018-09-25 23:36:50 +10:00

demo.js.map

v3.4.4

2018-09-25 23:36:50 +10:00

demo.min.js

v3.4.4

2018-09-25 23:36:50 +10:00

demo.min.js.map

v3.4.4

2018-09-25 23:36:50 +10:00

error.css

Fix merge

2018-07-30 23:29:02 +10:00