From: William Entriken <github.com@phor.net>
Date: Mon, 27 Jun 2016 17:59:41 +0000 (-0400)
Subject: Merge pull request #2741 from duerahan/master
X-Git-Tag: v2.2.0-rc.1~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2270ed8db8d2796567e333f60df896425f9a9b2;p=thirdparty%2FChart.js.git

Merge pull request #2741 from duerahan/master

time type xAxis height crah in line chart #2622
---

f2270ed8db8d2796567e333f60df896425f9a9b2
diff --cc src/scales/scale.time.js
index 3ada3e5e4,fbb4fbfa1..6affaebe8
mode 100644,100755..100755
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
diff --cc test/scale.time.tests.js
index 27af3ed54,0d1b8b8c0..f3173e1c4
mode 100644,100755..100755
--- a/test/scale.time.tests.js
+++ b/test/scale.time.tests.js