Leopoldthecoder f0b7debd23 Merge remote-tracking branch 'eleme/dev' into carbon ... # Conflicts: # CHANGELOG.en-US.md # CHANGELOG.zh-CN.md # examples/app.vue # examples/docs/en-US/switch.md # examples/docs/zh-CN/switch.md # examples/versions.json # package.json # packages/switch/src/component.vue # packages/theme-default/package.json # packages/theme-default/src/common/var.css # packages/theme-default/src/switch.css # src/index.js		2017-10-16 18:33:41 +08:00
..
src	Merge remote-tracking branch 'eleme/dev' into carbon	2017-10-16 18:33:41 +08:00
index.js	Components: use es2015 export module, fixed #907	2016-11-08 15:01:00 +08:00