Sam Potts 535c046b62 Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
#	dist/plyr.js
#	src/js/plyr.js
2017-03-28 09:30:37 +11:00
..
2017-03-28 09:19:58 +11:00
2016-10-23 21:21:42 +11:00