Evert Timberg dcc06eb3bb Merge branch 'v2.0-dev' into v2.0-legend ...

Conflicts:
	src/core/core.scaleService.js

2015-12-03 21:21:10 -05:00

..

charts

Remove commented code

2015-11-19 21:20:04 -05:00

controllers

Merge pull request #1647 from nnnick/fix/1324

2015-11-16 16:09:53 -07:00

core

Merge branch 'v2.0-dev' into v2.0-legend

2015-12-03 21:21:10 -05:00

elements

Can now skip in all cases (start, mid, end) whether or not there is a look

2015-11-15 11:16:41 -05:00

scales

Merge pull request #1736 from nnnick/umd-build

2015-12-02 20:37:04 -07:00