]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
projects / thirdparty / Chart.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba6afa7 e7df265)
Merge branch 'v2.0-dev' of github.com:roben/Chart.js into v2.0-dev
authorRobert Becker <robert@rbecker.eu>
Thu, 4 Feb 2016 09:38:35 +0000 (10:38 +0100)
committerRobert Becker <robert@rbecker.eu>
Thu, 4 Feb 2016 09:38:35 +0000 (10:38 +0100)
# Conflicts:
# src/core/core.helpers.js


Trivial merge
Mirror of https://github.com/chartjs/Chart.js.git