From: Evert Timberg Date: Sun, 20 Mar 2016 15:15:41 +0000 (-0400) Subject: Merge pull request #2157 from nnnick/fix/2156 X-Git-Tag: v2.0.0~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3926198d95a1e0ca0e89f8ac69a3e986e883ff3;p=thirdparty%2FChart.js.git Merge pull request #2157 from nnnick/fix/2156 Fix scale merge when the xAxes object is specified but the type is not --- f3926198d95a1e0ca0e89f8ac69a3e986e883ff3