Sam Potts aae1092bac Merge branch 'develop' of github.com:sampotts/plyr into develop ...

# Conflicts:
#	src/js/captions.js
#	src/js/controls.js
#	src/js/fullscreen.js
#	src/js/html5.js
#	src/js/listeners.js
#	src/js/plugins/youtube.js
#	src/js/plyr.js
#	src/js/utils.js

2018-06-13 00:41:30 +10:00

..

blank.mp4

Add blank.mp4 to dist files

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

plyr.css

Merge

2018-06-11 16:45:40 +10:00

plyr.js

Merge branch 'develop' of github.com:sampotts/plyr into develop

2018-06-13 00:41:30 +10:00

plyr.js.map

Merge branch 'develop' of github.com:sampotts/plyr into develop

2018-06-13 00:41:30 +10:00

plyr.min.js

Merge branch 'develop' of github.com:sampotts/plyr into develop

2018-06-13 00:41:30 +10:00

plyr.min.js.map

Merge branch 'develop' of github.com:sampotts/plyr into develop

2018-06-13 00:41:30 +10:00

plyr.polyfilled.js

Merge branch 'develop' of github.com:sampotts/plyr into develop

2018-06-13 00:41:30 +10:00

plyr.polyfilled.js.map

Merge branch 'develop' of github.com:sampotts/plyr into develop

2018-06-13 00:41:30 +10:00

plyr.polyfilled.min.js

Merge branch 'develop' of github.com:sampotts/plyr into develop

2018-06-13 00:41:30 +10:00

plyr.polyfilled.min.js.map

Merge branch 'develop' of github.com:sampotts/plyr into develop

2018-06-13 00:41:30 +10:00

plyr.svg

Work on PiP

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