Sam Potts 35f7ee9c59 Merge branch 'develop' into css-variables ...

# Conflicts:
#	demo/dist/demo.css
#	demo/index.html
#	dist/plyr.css
#	gulpfile.js
#	package.json
#	yarn.lock

2019-03-16 12:14:20 +11:00

..

demo.css

Merge branch 'develop' into css-variables

2019-03-16 12:14:20 +11:00

demo.js

Merge branch 'develop' into css-variables

2019-03-16 12:14:20 +11:00

demo.svg

Update build process

2019-02-19 01:05:59 +11:00

error.css

Fix merge

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