Sam Potts 1a5f4b1b9e Merge branch 'develop' of github.com:Selz/plyr into develop
# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map
#	src/js/defaults.js
2017-11-07 23:23:17 +11:00
..
2017-11-06 20:27:19 +11:00
2017-05-16 10:20:58 +10:00
2016-10-23 21:21:42 +11:00