• 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
Name
Last commit
Last update
examples Loading commit data...
lib Loading commit data...
src Loading commit data...
.editorconfig Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.jshintrc Loading commit data...
.travis.yml Loading commit data...
API.md Loading commit data...
CONTRIBUTING.md Loading commit data...
FAQ.md Loading commit data...
Gruntfile.js Loading commit data...
LICENSE.txt Loading commit data...
NEWS.md Loading commit data...
PLUGINS.md Loading commit data...
README.md Loading commit data...
bower.json Loading commit data...
flot.jquery.json Loading commit data...
package.json Loading commit data...