]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/unit-test 1424/head
authorEvert Timberg <evert.timberg@gmail.com>
Fri, 28 Aug 2015 23:09:39 +0000 (19:09 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Fri, 28 Aug 2015 23:09:39 +0000 (19:09 -0400)
commit7fed38f1abe18922512416aa2c74b8046837b6f6
tree2e01f6f68176284693888826d422c3b00399c78c
parent92f1c65c1c2651c23f415d70b10e5210b2fca78c
parent2a49e226f9f442481e73d47c1c003227a2f765a6
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/unit-test

Conflicts:
gulpfile.js
gulpfile.js