Skip to content

Commit

Permalink
Merge branch 'hotfix/v'
Browse files Browse the repository at this point in the history
Former-commit-id: 61bdd25613d91337d9ea68c8e5396b3624a3107c [formerly 61bdd25613d91337d9ea68c8e5396b3624a3107c [formerly 61bdd25613d91337d9ea68c8e5396b3624a3107c [formerly 61bdd25613d91337d9ea68c8e5396b3624a3107c [formerly fa4fd15 [formerly 873b2b9d12b383cb3aacf76f8f542194850dbde5]]]]]
Former-commit-id: fe6da13
Former-commit-id: 9e1575a
Former-commit-id: 28df7854eee983c50bed245a90226db8d6795a18 [formerly 0d1bad4c0fcd9b7ee376691c5c3b597e2882e74a]
Former-commit-id: c260c8d91412f7bc9bbc1fe71c14c92afca76281
Former-commit-id: fd49aa5c2c142272194b599a8e0c58b563488074
Former-commit-id: 285298713ceab2d3058a0483f24ad1fd7603fb71
Former-commit-id: 71e939d6dc66816b8c78463ac0646134459ea0cd
Former-commit-id: 0f8dbfe77022a9680d7358c5c20a6df5a86b9cdb
  • Loading branch information
FairyEver committed Dec 26, 2018
2 parents ce44aa1 + 129960c commit 8a989b0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package-lock.json.REMOVED.git-id

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "d2-admin",
"version": "1.6.9",
"version": "1.6.10",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --open",
Expand Down

0 comments on commit 8a989b0

Please sign in to comment.