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-05 18:57:22 +11:00
2017-11-07 18:01:24 +11:00
2017-11-04 14:25:28 +11:00
2017-11-06 22:00:00 +11:00
2017-11-07 18:01:24 +11:00
2017-11-04 21:19:02 +11:00
2017-11-05 11:45:02 +11:00
2017-11-05 01:13:00 +11:00
2017-11-04 14:25:28 +11:00
2017-11-07 18:01:24 +11:00