From 27c889d3a565d14573357dc1259b28c525097a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Sun, 26 Aug 2018 17:09:42 +0800
Subject: [PATCH 1/2] Update README.md
Former-commit-id: 0ad936b810427773be606f5877ac7c1b4f989f1a [formerly 0ad936b810427773be606f5877ac7c1b4f989f1a [formerly 0ad936b810427773be606f5877ac7c1b4f989f1a [formerly 0ad936b810427773be606f5877ac7c1b4f989f1a [formerly eb54496d0c1e2ed07f744f12714100ca8434bffb [formerly 0ffaa1d4ef48afbd32f1a8cc7e71e4ae65f77b42]]]]]
Former-commit-id: 108db949e1f8534bbb60e7679551ca1d9df6827d
Former-commit-id: 4d8e8f3f57499131daeb08dedee2d72a91a3b956
Former-commit-id: 41792c816718611ce27570c68e1f2f4fce86a7a6 [formerly 8886532171ca26015d2c3dcaea4613b2057525ee]
Former-commit-id: 61fa56875dbc1f326e7309b38c69e28db1b99086
Former-commit-id: 77634f0a44b62ea16508d4cf428cf647d30992c6
Former-commit-id: 59c8fc7a3dfe463d5693a71e14a7ff630beb4c5b
Former-commit-id: bde0e6e4864f615f1e6a2cb213879a5cda57bbd7
Former-commit-id: b5e14315bd550189471214171b55255eb8072c23
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index df78d5b4..0cf4d06d 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ D2Admin 是一个开源的管理系统前端集成方案,为了方便开发者
**文档**
[中文文档 码云部署](http://d2admin.fairyever.com/zh/) |
-[中文文档 VPS部署](http://app.d3collection.cn/d2-admin-doc/lastest/zh/)
+[中文文档 服务器部署](http://app.d3collection.cn/d2-admin-doc/lastest/zh/)
两个文档地址内容一致,哪个快请用哪个。
@@ -125,4 +125,4 @@ npm run build
* [avue](https://github.com/nmxiaowei/avue)
-
\ No newline at end of file
+
From 05669267997c537c9d2cdf77a7756ae67b80a7b2 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 27 Aug 2018 14:00:53 +0800
Subject: [PATCH 2/2] no message
Former-commit-id: f14186c95a61217cf9b84194ca8a5b6b3abb8934 [formerly f14186c95a61217cf9b84194ca8a5b6b3abb8934 [formerly f14186c95a61217cf9b84194ca8a5b6b3abb8934 [formerly f14186c95a61217cf9b84194ca8a5b6b3abb8934 [formerly e6b2603816686b80bd758c256f9d81adce2e1d6c [formerly 76d3ef34e157cf594d8751094f262a809a2ff01a]]]]]
Former-commit-id: 08deedef1eb6a513885b399c7e0785f501296fc7
Former-commit-id: d1727c34705a6ae790e9940f8025304dfefd5f63
Former-commit-id: 1c168a87547c52e68b37288eb6fbb7491f61a10c [formerly 0d84caf32c8997b055b27c59b777d8493edec815]
Former-commit-id: cb8e24bbc62e78546d1cd59c0a0524b9f8713b05
Former-commit-id: 47eb04f1c994c14256c36e98156bd395da6905de
Former-commit-id: d07cdd695cae82be7562ce6761b695142f4b81d4
Former-commit-id: 972b8b94fe531b3523d0bd133dc265492cb93f49
Former-commit-id: de7e00f90f649cb994f5ca09a88109c414324793
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 2e366f33..0af0e951 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "d2-admin",
- "version": "1.2.0",
+ "version": "1.2.1",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --open",