Sam Potts 7de9fd1d65 Merge branch 'develop' ...

# Conflicts:
#	changelog.md
#	demo/dist/demo.css
#	demo/dist/demo.js.map
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.css
#	dist/plyr.js.map
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	package.json
#	readme.md
#	src/js/plyr.js
#	src/js/plyr.polyfilled.js

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

..

blank.mp4

Add blank.mp4 to dist files

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

plyr.css

Merge branch 'develop'

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

plyr.js

3.3.16

2018-06-29 00:38:11 +10:00

plyr.js.map

Merge branch 'develop'

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

plyr.min.js

3.3.16

2018-06-29 00:38:11 +10:00

plyr.min.js.map

Merge branch 'develop'

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

plyr.polyfilled.js

3.3.16

2018-06-29 00:38:11 +10:00

plyr.polyfilled.js.map

Merge branch 'develop'

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

plyr.polyfilled.min.js

3.3.16

2018-06-29 00:38:11 +10:00

plyr.polyfilled.min.js.map

Merge branch 'develop'

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

plyr.svg

Work on PiP

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