• David Schnur's avatar
    Merge branch 'master' into 0.9-work · 7043573a
    David Schnur authored
    Conflicts:
    	NEWS.md
    	component.json
    	flot.jquery.json
    	jquery.flot.canvas.js
    	jquery.flot.fillbetween.js
    	jquery.flot.pie.js
    	jquery.flot.time.js
    	package.json
    	src/jquery.flot.js
    	src/plugins/jquery.flot.crosshair.js
    	src/plugins/jquery.flot.navigate.js
    	src/plugins/jquery.flot.resize.js
    7043573a
To find the state of this project's repository at the time of any of these versions, check out the tags.