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

# Conflicts:
#	dist/plyr.css
#	dist/plyr.js
#	src/js/plyr.js
#	src/less/plyr.less
#	src/scss/plyr.scss

2017-03-25 11:24:38 +11:00

..

dist

Version bump to 2.0.12

2017-03-25 10:58:41 +11:00

src

Loop variable naming

2017-03-25 10:08:39 +11:00

webvtt

Manually merged #385

2016-10-01 22:07:01 +10:00

error.html

Manually merged #385

2016-10-01 22:07:01 +10:00

index.html

Merge branch 'master' into develop

2017-03-25 11:24:38 +11:00