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

..

blank.mp4

Add blank.mp4 to dist files

2017-03-25 10:58:36 +01:00

plyr.css

Merge branch 'develop' into css-variables

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

plyr.js

v3.4.7

2018-11-08 23:34:10 +11:00

plyr.js.map

v3.4.7

2018-11-08 23:34:10 +11:00

plyr.min.js

v3.4.7

2018-11-08 23:34:10 +11:00

plyr.min.js.map

v3.4.7

2018-11-08 23:34:10 +11:00

plyr.polyfilled.js

v3.4.7

2018-11-08 23:34:10 +11:00

plyr.polyfilled.js.map

v3.4.7

2018-11-08 23:34:10 +11:00

plyr.polyfilled.min.js

v3.4.7

2018-11-08 23:34:10 +11:00

plyr.polyfilled.min.js.map

v3.4.7

2018-11-08 23:34:10 +11:00

plyr.svg

v3.4.5

2018-10-24 23:04:18 +11:00