From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Thu, 12 May 2016 22:22:55 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/nnnick/Chart.js
X-Git-Tag: v2.1.3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41c043dd239a5e63009ce13c705e589e64d5b29f;p=thirdparty%2FChart.js.git

Merge branch 'master' of https://github.com/nnnick/Chart.js

Conflicts:
	docs/01-Scales.md
---

41c043dd239a5e63009ce13c705e589e64d5b29f