Leopoldthecoder 6d3636fbac Merge remote-tracking branch 'eleme/dev' into carbon ... # Conflicts: # CHANGELOG.en-US.md # CHANGELOG.zh-CN.md # examples/app.vue # examples/index.tpl # examples/versions.json # package.json # packages/dropdown/src/dropdown.vue # packages/theme-default/package.json # packages/theme-default/src/date-picker/date-picker.css # src/index.js		2017-10-24 18:48:54 +08:00
..
specs	Merge remote-tracking branch 'eleme/dev' into carbon	2017-10-24 18:48:54 +08:00
index.js	remove theme-default (#7273)	2017-09-28 05:01:29 -05:00
karma.conf.js	use chrome to run tests (#7521)	2017-10-16 19:39:44 -05:00
util.js	add accessibility for slider and fixbug for unittest	2017-09-26 06:48:01 -05:00