]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Merge branch 'master' into v2.0-dev
authorTanner Linsley <tannerlinsley@gmail.com>
Sat, 16 Apr 2016 23:13:23 +0000 (18:13 -0500)
committerTanner Linsley <tannerlinsley@gmail.com>
Sat, 16 Apr 2016 23:13:23 +0000 (18:13 -0500)
1  2 
CONTRIBUTING.md

diff --cc CONTRIBUTING.md
Simple merge