lisang
/
iview-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.0' 

# Conflicts:
#	README.md
This commit is contained in:
zhigang.li@tendcloud.com 2018-10-11 17:28:44 +08:00
parent aa46211e2d 6d225a9118
commit 6e9eb65ec0
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -12,8 +12,11 @@
[![iview ui](https://img.shields.io/badge/iview-3.0.0-brightgreen.svg?style=flat-square)](https://github.com/iview/iview) [![iview ui](https://img.shields.io/badge/iview-3.0.0-brightgreen.svg?style=flat-square)](https://github.com/iview/iview)
[![npm](https://img.shields.io/npm/l/express.svg)]() [![npm](https://img.shields.io/npm/l/express.svg)]()
<<<<<<< HEAD
## 当前版本：v2.0-beta.6 ## 当前版本：v2.0-beta.6
=======
>>>>>>> 2.0
[更新日志](https://github.com/iview/iview-admin/releases) [更新日志](https://github.com/iview/iview-admin/releases)
[使用文档](https://lison16.github.io/iview-admin-doc/#/) [使用文档](https://lison16.github.io/iview-admin-doc/#/)