• Leopoldthecoder's avatar
    Merge remote-tracking branch 'eleme/dev' into carbon · f0b7debd
    Leopoldthecoder authored
    # 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
    f0b7debd
versions.json 93 Bytes