Skip to content

Commit

Permalink
Merge branch 'master' into discovery
Browse files Browse the repository at this point in the history
  • Loading branch information
Xiaozhe Yao authored Nov 29, 2018
2 parents 339e95c + fe1c5ee commit 960c22f
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 79 deletions.
98 changes: 36 additions & 62 deletions dashboard/package-lock.json

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

4 changes: 2 additions & 2 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"eslint-config-standard": "12.0.0",
"eslint-friendly-formatter": "4.0.1",
"eslint-loader": "2.1.1",
"eslint-plugin-html": "4.0.6",
"eslint-plugin-html": "5.0.0",
"eslint-plugin-import": "2.14.0",
"eslint-plugin-node": "8.0.0",
"eslint-plugin-promise": "4.0.1",
Expand All @@ -64,7 +64,7 @@
"rimraf": "2.6.2",
"selenium-server": "3.141.5",
"semver": "5.6.0",
"shelljs": "0.8.2",
"shelljs": "0.8.3",
"uglifyjs-webpack-plugin": "2.0.1",
"url-loader": "1.1.2",
"vue-jest": "3.0.0",
Expand Down
19 changes: 12 additions & 7 deletions discovery/package-lock.json

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

28 changes: 21 additions & 7 deletions docs/package-lock.json

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

2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"docs:build": "vuepress build ."
},
"dependencies": {
"amazon-cognito-identity-js-typescript": "^1.22.0",
"amazon-cognito-identity-js-typescript": "1.22.0",
"vuepress": "0.14.4"
}
}

0 comments on commit 960c22f

Please sign in to comment.