5 Commits

Author	SHA1	Message	Date
Sam Potts	95be6e721b	Fixed merge	2019-06-01 20:01:19 +10:00
Sam Potts	12c6282d14	Merge branch 'develop' into css-variables ... # Conflicts: # .eslintrc # demo/dist/demo.css # demo/dist/demo.js # demo/dist/demo.min.js # demo/dist/demo.min.js.map # dist/plyr.css # dist/plyr.js # dist/plyr.min.js # dist/plyr.min.js.map # dist/plyr.min.mjs # dist/plyr.min.mjs.map # dist/plyr.mjs # dist/plyr.polyfilled.js # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map # dist/plyr.polyfilled.min.mjs # dist/plyr.polyfilled.min.mjs.map # dist/plyr.polyfilled.mjs # gulpfile.js # package.json	2019-06-01 19:55:14 +10:00
Sam Potts	c9055f391b	Linting changes	2019-06-01 18:45:07 +10:00
Sam Potts	b9dbcc30fa	Eslint config rename	2019-04-25 12:03:42 +10:00
Sam Potts	996075decc	More work on variable usage	2019-04-11 20:50:20 +10:00