Merge remote-tracking branch 'eleme/master' into dev

2019-01-26 14:25:23 +08:00 · 2019-01-26 14:25:23 +08:00 · d57d79bd61
parent 0ddc10d652 37f43a1f90
commit d57d79bd61
4 changed files with 4 additions and 4 deletions
--- a/examples/versions.json
+++ b/examples/versions.json
@ -1 +1 @@
-{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4"}
+{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.5.0":"2.4"}
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "element-ui",
-  "version": "2.4.11",
+  "version": "2.5.0",
  "description": "A Component Library for Vue.js.",
  "main": "lib/element-ui.common.js",
  "files": [
--- a/packages/theme-chalk/package.json
+++ b/packages/theme-chalk/package.json
@ -1,6 +1,6 @@
 {
  "name": "element-theme-chalk",
-  "version": "2.4.11",
+  "version": "2.5.0",
  "description": "Element component chalk theme.",
  "main": "lib/index.css",
  "style": "lib/index.css",
--- a/src/index.js
+++ b/src/index.js
@ -172,7 +172,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }

 export default {
-  version: '2.4.11',
+  version: '2.5.0',
  locale: locale.use,
  i18n: locale.i18n,
  install,