Skip to content
Merged
Prev Previous commit
Merge branch 'master'
Conflicts:
	@commitlint/load/package.json
	@commitlint/prompt/package.json
	@commitlint/travis-cli/package.json
	yarn.lock
  • Loading branch information
armano2 committed Jan 18, 2020
commit d678d648d14e3d6375c6f58a09e36e5222501cd7
2 changes: 1 addition & 1 deletion @commitlint/load/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
},
"dependencies": {
"@commitlint/execute-rule": "^8.3.4",
"@commitlint/resolve-extends": "^8.3.4",
"@commitlint/resolve-extends": "^8.3.5",
"chalk": "2.4.2",
"cosmiconfig": "^5.2.0",
"lodash": "4.17.15",
Expand Down
2 changes: 1 addition & 1 deletion @commitlint/prompt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"cross-env": "6.0.3"
},
"dependencies": {
"@commitlint/load": "^8.3.4",
"@commitlint/load": "^8.3.5",
"chalk": "^2.0.0",
"lodash": "4.17.15",
"throat": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion @commitlint/travis-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"which": "2.0.1"
},
"dependencies": {
"@commitlint/cli": "^8.3.4",
"@commitlint/cli": "^8.3.5",
"execa": "0.11.0"
}
}
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1874,20 +1874,20 @@
resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==

"@types/node@*", "@types/node@>= 8":
version "13.1.2"
resolved "https://registry.npmjs.org/@types/node/-/node-13.1.2.tgz#fe94285bf5e0782e1a9e5a8c482b1c34465fa385"
integrity sha512-B8emQA1qeKerqd1dmIsQYnXi+mmAzTB7flExjmy5X1aVAKFNNNDubkavwR13kR6JnpeLp3aLoJhwn9trWPAyFQ==
"@types/node@*":
version "12.0.2"
resolved "https://registry.npmjs.org/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==

"@types/[email protected]":
version "12.11.5"
resolved "https://registry.npmjs.org/@types/node/-/node-12.11.5.tgz#6c3c8dc84988aff11fd2a63d7b5fbf39eaaab7b1"
integrity sha512-LC8ALj/24PhByn39nr5jnTvpE7MujK8y7LQmV74kHYF5iQ0odCPkMH4IZNZw+cobKfSXqaC8GgegcbIsQpffdA==

"@types/node@^12.0.2":
version "12.12.22"
resolved "https://registry.npmjs.org/@types/node/-/node-12.12.22.tgz#b8d9eae3328b96910a373cf06ac8d3c5abe9c200"
integrity sha512-r5i93jqbPWGXYXxianGATOxTelkp6ih/U0WVnvaqAvTqM+0U6J3kw6Xk6uq/dWNRkEVw/0SLcO5ORXbVNz4FMQ==
"@types/node@^12.12.22":
version "12.12.24"
resolved "https://registry.npmjs.org/@types/node/-/node-12.12.24.tgz#d4606afd8cf6c609036b854360367d1b2c78931f"
integrity sha512-1Ciqv9pqwVtW6FsIUKSZNB82E5Cu1I2bBTj1xuIHXLe/1zYLl3956Nbhg2MzSYHVfl9/rmanjbQIb7LibfCnug==

"@types/normalize-package-data@^2.4.0":
version "2.4.0"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.