Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Former-commit-id: a7723455167d5f91429e2c2fcb00e05a9e830a4c [formerly a7723455167d5f91429e2c2fcb00e05a9e830a4c [formerly a7723455167d5f91429e2c2fcb00e05a9e830a4c [formerly a7723455167d5f91429e2c2fcb00e05a9e830a4c [formerly 5bcb806 [formerly 2964275a5c8476890ae8b7d72ae294e09e8cf8b7]]]]]
Former-commit-id: 280dfe5
Former-commit-id: 15a31d0
Former-commit-id: 71f949beb62d94b345b91c1ef46e72ab37c53597 [formerly c4d83b9af57a07cb1a23b3f3c49839a35a943888]
Former-commit-id: 894c444ffdb911f295027afc18d0f2e6f8270cfe
Former-commit-id: f49ae6fb1753844defce74aefcff2adda77dfb36
Former-commit-id: 3d0665f660ccddb1b63218318ffa2840e16109ed
Former-commit-id: 088820e1cf0e37b000699d14b7be74c3936d6040
Former-commit-id: 464605f53726320dbd128a1123dfdea275396fcf
  • Loading branch information
FairyEver committed Mar 22, 2019
2 parents 33ad064 + e5a975c commit 28ae1a3
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.18",
"version": "1.6.17",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --open",
Expand Down

0 comments on commit 28ae1a3

Please sign in to comment.