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

# Conflicts:
#	changelog.md
#	dist/plyr.js.map
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js.map
#	package.json

2018-07-18 21:44:39 +10:00

..

demo.css

Merge branch 'develop'

2018-06-29 00:43:02 +10:00

demo.js

3.3.17

2018-07-18 21:41:46 +10:00

demo.js.map

3.3.17

2018-07-18 21:41:46 +10:00

demo.min.js

3.3.17

2018-07-18 21:41:46 +10:00

demo.min.js.map

3.3.17

2018-07-18 21:41:46 +10:00

error.css

Style fixes

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