Merge branch 'v2.0-dev' of github.com:roben/Chart.js into v2.0-dev

Browse Source

# Conflicts:
#	src/core/core.helpers.js

...

This commit is contained in:

Robert Becker 2016-02-04 10:38:35 +01:00

parent ba6afa7257 e7df265c7a

commit df218ead82

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available