Sam Potts 5a244b7fed Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map
#	src/js/controls.js
2017-11-18 19:33:01 +11:00
..
2017-03-25 10:58:36 +01:00
2017-11-18 19:31:45 +11:00
2017-11-18 19:31:45 +11:00
2016-10-23 21:21:42 +11:00