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
..
2015-11-17 18:38:19 -05:00
2015-08-30 20:17:24 -04:00
2015-08-29 12:31:44 -04:00