mirror of
https://github.com/morrisjs/morris.js.git
synced 2024-09-21 10:41:32 +02:00
0e8c0f49b6
Previous point-width work by other contributors conflicted, so have tied the two changes and sets of tests together. Have also slightly changed some variable / config names to read easier. Merge branch 'master' of https://github.com/dgilperez/morris.js into dgilperez-master Conflicts: lib/morris.line.coffee morris.js morris.min.js |
||
---|---|---|
.. | ||
area | ||
bar | ||
donut | ||
grid | ||
line | ||
commas_spec.coffee | ||
hover_spec.coffee | ||
label_series_spec.coffee | ||
pad_spec.coffee | ||
parse_time_spec.coffee |