Sam Potts
44739a17d0
Merge branch 'master' into develop
# Conflicts:
# changelog.md
# demo/dist/demo.js.map
# demo/dist/demo.min.js
# demo/dist/demo.min.js.map
# demo/index.html
# dist/plyr.js.map
# dist/plyr.min.js
# dist/plyr.min.js.map
# dist/plyr.polyfilled.js
# dist/plyr.polyfilled.js.map
# dist/plyr.polyfilled.min.js
# dist/plyr.polyfilled.min.js.map
# package.json
# readme.md
# yarn.lock
2019-01-26 16:50:37 +11:00
..
2017-03-25 10:58:36 +01:00
2019-01-26 16:31:47 +11:00
2019-01-26 16:50:37 +11:00
2019-01-26 16:50:37 +11:00
2019-01-26 16:50:37 +11:00
2019-01-26 16:50:37 +11:00
2019-01-26 16:50:37 +11:00
2019-01-26 16:50:37 +11:00
2019-01-26 16:50:37 +11:00
2019-01-26 16:50:37 +11:00
2019-01-17 11:37:19 +11:00