6 Commits

Author	SHA1	Message	Date
Sam Potts	248005e8e0	Fix merge	2018-07-30 23:29:02 +10:00
Sam Potts	dae272ef66	Merge branch 'develop' into a11y-improvements ... # Conflicts: # demo/dist/demo.css # dist/plyr.css # dist/plyr.js.map # dist/plyr.min.js # dist/plyr.min.js.map # dist/plyr.polyfilled.js.map # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map # package.json # src/js/plyr.js	2018-07-30 23:09:12 +10:00
Sam Potts	ead6601394	Merge	2018-07-02 23:11:59 +10:00
Sam Potts	e61ebd8d05	Merge branch 'develop' into a11y-improvements	2018-07-02 23:11:50 +10:00
Sam Potts	1f1d74ba50	Work on menus	2018-06-21 09:01:16 +10:00
Sam Potts	384010a2c0	Style fixes	2018-04-04 16:50:00 +10:00