Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e345b9b

Browse files
authoredJul 21, 2017
Rollup merge of #43319 - SimonSapin:cargoup, r=alexcrichton
Update Cargo to ffab51954ec32d55631c37a8730bb24915fc090b rust-lang/cargo#4123 added the `[patch]` section of the manifest
2 parents e6ef4b9 + b77ff24 commit e345b9b

File tree

3 files changed

+38
-1
lines changed

3 files changed

+38
-1
lines changed
 

‎src/Cargo.lock

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/tools/tidy/src/deps.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ static LICENSES: &'static [&'static str] = &[
1818
"MIT/Apache-2.0",
1919
"MIT / Apache-2.0",
2020
"Apache-2.0/MIT",
21+
"Apache-2.0 / MIT",
2122
"MIT OR Apache-2.0",
2223
"MIT",
2324
"Unlicense/MIT",

0 commit comments

Comments
 (0)
Please sign in to comment.