Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue

Conflicts: packages/zanui-css/src/index.css
2017-03-03 17:58:36 +08:00
parent e918c52fd0 f224cda4f2
commit 5e976c8e20
36 changed files with 520 additions and 40775 deletions
@@ -61,7 +61,7 @@ if (typeof window !== 'undefined' && window.Vue) {

 module.exports = {
  install,
-  version: '0.0.13',
+  version: '0.0.14',
  Button,
  Switch,
  Field,