From: Tanner Linsley Date: Fri, 19 Jun 2015 18:36:27 +0000 (-0600) Subject: Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev X-Git-Tag: 2.0.0-alpha4~74 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=190cfcd1dc36733dfdd399e81f6862d0db1c628d;p=thirdparty%2FChart.js.git Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev --- 190cfcd1dc36733dfdd399e81f6862d0db1c628d