Sam Potts 3fad6ed42c Merge branch 'develop' into a11y-improvements ...

# Conflicts:
#	demo/dist/demo.css
#	dist/plyr.css
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	src/js/captions.js

2018-06-11 16:54:20 +10:00

..

blank.mp4

Add blank.mp4 to dist files

2017-03-25 10:58:36 +01:00

plyr.css

Merge branch 'develop' into a11y-improvements

2018-06-11 16:54:20 +10:00

plyr.js

Merge branch 'develop' into a11y-improvements

2018-06-11 16:54:20 +10:00

plyr.js.map

Merge branch 'develop' into a11y-improvements

2018-06-11 16:54:20 +10:00

plyr.min.js

Merge branch 'develop' into a11y-improvements

2018-06-11 16:54:20 +10:00

plyr.min.js.map

Merge branch 'develop' into a11y-improvements

2018-06-11 16:54:20 +10:00

plyr.polyfilled.js

Merge branch 'develop' into a11y-improvements

2018-06-11 16:54:20 +10:00

plyr.polyfilled.js.map

Merge branch 'develop' into a11y-improvements

2018-06-11 16:54:20 +10:00

plyr.polyfilled.min.js

Merge branch 'develop' into a11y-improvements

2018-06-11 16:54:20 +10:00

plyr.polyfilled.min.js.map

Merge branch 'develop' into a11y-improvements

2018-06-11 16:54:20 +10:00

plyr.svg

Work on PiP

2016-10-23 21:21:42 +11:00