Sam Potts e8e2b8ba39 Merge branch 'master' into develop ...

# Conflicts:
#	.eslintrc
#	demo/dist/demo.css
#	demo/dist/demo.js
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.css
#	dist/plyr.js
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs
#	dist/plyr.min.mjs.map
#	dist/plyr.mjs
#	dist/plyr.polyfilled.js
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs
#	dist/plyr.polyfilled.min.mjs.map
#	dist/plyr.polyfilled.mjs
#	package.json
#	readme.md
#	src/js/listeners.js
#	yarn.lock

2019-06-20 23:56:19 +10:00

..

demo.css

Merge branch 'master' into develop

2019-06-20 23:56:19 +10:00

demo.js

Merge branch 'master' into develop

2019-06-20 23:56:19 +10:00

demo.min.js

Merge branch 'master' into develop

2019-06-20 23:56:19 +10:00

demo.min.js.map

Merge branch 'master' into develop

2019-06-20 23:56:19 +10:00

demo.svg

Update build process

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

error.css

Styling tweaks for demo

2019-06-20 23:50:46 +10:00