]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
Merge remote-tracking branch 'chartjs-origin/master'
authorunknown <slinhart@knights.ucf.edu>
Mon, 4 Jul 2016 00:35:21 +0000 (18:35 -0600)
committerunknown <slinhart@knights.ucf.edu>
Mon, 4 Jul 2016 00:35:21 +0000 (18:35 -0600)
commit924a5d0abcc6d2889cd499ff2cc2812b438c873d
tree926cc551af4ab79402d95d9e2979dc608a05f9fa
parentd38111723676d51d6a2b49bd3eec71b675d508ca
parentb197fdae42e6a8d8540bb14792aaf76ea4f6259a
Merge remote-tracking branch 'chartjs-origin/master'

Conflicts:
src/core/core.legend.js
docs/01-Chart-Configuration.md
src/core/core.legend.js