Sam Potts f3ea31c515 Merge branch 'beta' of github.com:sampotts/plyr into beta
# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map
2018-02-05 21:28:16 +11:00
..
2018-02-05 21:26:18 +11:00
2018-02-05 21:26:18 +11:00