From: Tanner Linsley Date: Mon, 12 Oct 2015 17:51:21 +0000 (-0600) Subject: Merge pull request #1525 from etimberg/fix/scale-merge X-Git-Tag: 2.0.0-beta~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3da66ba42e84c1af0577c1ac0a26ad013e94f599;p=thirdparty%2FChart.js.git Merge pull request #1525 from etimberg/fix/scale-merge Merge scale settings at the correct time --- 3da66ba42e84c1af0577c1ac0a26ad013e94f599