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

# Conflicts:
#	demo/dist/demo.css
#	demo/dist/demo.min.js.map
#	demo/index.html
#	dist/plyr.css
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs.map
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs.map
#	gulpfile.js
#	src/sass/base.scss
#	src/sass/components/control.scss
#	src/sass/settings/colors.scss
#	src/sass/settings/controls.scss

2020-03-30 10:45:57 +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

2020-03-30 10:45:57 +11:00

plyr.js

Merge branch 'develop' of github.com:sampotts/plyr into develop

2020-03-29 12:02:59 +11:00

plyr.min.js

Merge branch 'develop' of github.com:sampotts/plyr into develop

2020-03-29 12:02:59 +11:00

plyr.min.js.map

Added prettier script

2020-03-29 12:13:24 +11:00

plyr.min.mjs

Merge branch 'develop' of github.com:sampotts/plyr into develop

2020-03-29 12:02:59 +11:00

plyr.min.mjs.map

Added prettier script

2020-03-29 12:13:24 +11:00

plyr.mjs

Merge branch 'develop' of github.com:sampotts/plyr into develop

2020-03-29 12:02:59 +11:00

plyr.polyfilled.js

Merge branch 'develop' of github.com:sampotts/plyr into develop

2020-03-29 12:02:59 +11:00

plyr.polyfilled.min.js

Merge branch 'develop' of github.com:sampotts/plyr into develop

2020-03-29 12:02:59 +11:00

plyr.polyfilled.min.js.map

Added prettier script

2020-03-29 12:13:24 +11:00

plyr.polyfilled.min.mjs

Merge branch 'develop' of github.com:sampotts/plyr into develop

2020-03-29 12:02:59 +11:00

plyr.polyfilled.min.mjs.map

Added prettier script

2020-03-29 12:13:24 +11:00

plyr.polyfilled.mjs

Merge branch 'develop' of github.com:sampotts/plyr into develop

2020-03-29 12:02:59 +11:00

plyr.svg

Prepare for 3.5.7 release

2020-01-30 11:34:07 +00:00