From: Evert Timberg <evert.timberg@gmail.com>
Date: Fri, 18 Sep 2015 22:38:47 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/v2.0-dev' into feature/resize_problems
X-Git-Tag: 2.0.0-alpha4~24^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcbd9a85e6398137ea646f997a5f1499043cc5a4;p=thirdparty%2FChart.js.git

Merge remote-tracking branch 'upstream/v2.0-dev' into feature/resize_problems

Conflicts:
	gulpfile.js
---

bcbd9a85e6398137ea646f997a5f1499043cc5a4
diff --cc gulpfile.js
index d55101d52,09ce81eff..4115ab8a3
--- a/gulpfile.js
+++ b/gulpfile.js
@@@ -34,7 -34,7 +34,8 @@@ var srcFiles = 
  	'./src/elements/**',
  	'./src/charts/**',
  	'./node_modules/color/dist/color.min.js',
- 	'./node_modules/javascript-detect-element-resize/detect-element-resize.js'
++	'./node_modules/javascript-detect-element-resize/detect-element-resize.js',
+ 	'./node_modules/moment/min/moment.min.js'
  ];