github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/14220/head
Zhi 2019-01-26 14:25:23 +08:00
parent 0ddc10d652 37f43a1f90
commit d57d79bd61
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/versions.json
View File

@ -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"}

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "element-ui", "name": "element-ui",
"version": "2.4.11", "version": "2.5.0",
"description": "A Component Library for Vue.js.", "description": "A Component Library for Vue.js.",
"main": "lib/element-ui.common.js", "main": "lib/element-ui.common.js",
"files": [ "files": [

2
packages/theme-chalk/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "element-theme-chalk", "name": "element-theme-chalk",
"version": "2.4.11", "version": "2.5.0",
"description": "Element component chalk theme.", "description": "Element component chalk theme.",
"main": "lib/index.css", "main": "lib/index.css",
"style": "lib/index.css", "style": "lib/index.css",

2
src/index.js
View File

@ -172,7 +172,7 @@ if (typeof window !== 'undefined' && window.Vue) {
} }
export default { export default {
version: '2.4.11', version: '2.5.0',
locale: locale.use, locale: locale.use,
i18n: locale.i18n, i18n: locale.i18n,
install, install,