Tanner Linsley b22f569e4d Merge branch 'v2.0-dev' into v2.0-dev-refactor ...

Conflicts:
	samples/line-scale-override.html
	samples/line-x-axis-filter.html
	samples/line.html
	src/controllers/controller.bar.js
	src/core/core.controller.js
	src/scales/scale.category.js

2015-09-24 14:34:26 -06:00

4.9 KiB

Raw Blame History

View Raw