From: Tanner Linsley <tannerlinsley@gmail.com>
Date: Sat, 19 Sep 2015 00:59:58 +0000 (-0600)
Subject: Merge pull request #1465 from nnnick/v2.0-dev-time-scale-bars-and-combo
X-Git-Tag: 2.0.0-alpha4~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=862045e49a04027a53c59cfc0ddd31628c38a123;p=thirdparty%2FChart.js.git

Merge pull request #1465 from nnnick/v2.0-dev-time-scale-bars-and-combo

Bar and combo support for time scale
---

862045e49a04027a53c59cfc0ddd31628c38a123