Sam Potts 9c599884a8 Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
#	dist/plyr.js
#	src/js/plyr.js
2017-02-05 11:36:53 +11:00
..
2016-11-06 21:47:44 +11:00
2016-10-23 21:21:42 +11:00