]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
Merge branch 'master' into feature/pan-support
authorEvert Timberg <evert.timberg+github@gmail.com>
Sun, 24 Apr 2016 00:06:18 +0000 (20:06 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Sun, 24 Apr 2016 00:06:18 +0000 (20:06 -0400)
commitb4a06f6e3408beffb18633be1eb08b0f24c41146
treee728c291e99248152ddbdd1b8c61d18e7305d611
parent47552152c3e1b53baa51735ea11fec0ef7f4eabd
parentc1d7725ae09d9dba5c30f579d697af7655ad875a
Merge branch 'master' into feature/pan-support

Conflicts:
src/core/core.controller.js