Merge branch 'hotfix/page'

Former-commit-id: cc6408a3d939531af88c3edd670dfbbfbdafd5fa [formerly cc6408a3d939531af88c3edd670dfbbfbdafd5fa [formerly cc6408a3d939531af88c3edd670dfbbfbdafd5fa [formerly cc6408a3d939531af88c3edd670dfbbfbdafd5fa [formerly ed684b2 [formerly 6f1730699f44c5bcc21122d55beae9c97541985b]]]]] Former-commit-id: 8a2adae Former-commit-id: 0e5a5a9 Former-commit-id: bff7bcaac440a8151a2aef25c12e130a35e0ea51 [formerly 84131283053a90abddfd04edcbaf0331580824e0] Former-commit-id: eb42a0de3ceba3eb16f25fb4c47a499858ccaead Former-commit-id: ddd48ede47768c2ef1688a4c0b4067d93fa14d1b Former-commit-id: a32535727c50dc9de185d7059bae8460348ed41a Former-commit-id: 22711ba9ea778747f9ac1018e51fb650fbcbc8a5 Former-commit-id: d2d0d268f56ae55e298cea4eb667ca4d3c057474
d2-projects · Oct 11, 2018 · f40a00f · f40a00f
2 parents df192bd + 9a71db1
commit f40a00f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",

diff --git a/src/pages/redirect/index.vue b/src/pages/redirect/index.vue
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-b2bf5f06d7bc6fbdb1464a1eea0e2eae737ea6af
+d79a89504ddeac52db5b28d82df86395ace9be85
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b2bf5f06d7bc6fbdb1464a1eea0e2eae737ea6af
		d79a89504ddeac52db5b28d82df86395ace9be85