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

..

dist

Merge branch 'develop' into css-variables

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

media

Controls cleanup, work on captions bug, click to invert time

2017-11-18 19:30:26 +11:00

src

Merge branch 'develop' into css-variables

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

error.html

Style fixes

2018-04-04 16:50:00 +10:00

index.html

Merge branch 'develop' into css-variables

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

package.json

Demo packages updated

2020-02-10 11:25:39 +00:00

yarn.lock

3.5.6

2019-06-21 12:35:47 +10:00