projects
/
cargo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c4003c4
4977c4c
)
Auto merge of #4920 - wking:license-expression, r=matklad
author
bors
<bors@rust-lang.org>
Mon, 8 Jan 2018 19:11:39 +0000
(19:11 +0000)
committer
bors
<bors@rust-lang.org>
Mon, 8 Jan 2018 19:11:39 +0000
(19:11 +0000)
Cargo.toml: Replace '/' with 'OR' in 'license'
Catch up with our recommendations from
7dee65fe
(#4898), which deprecated `/` in favor of vanilla SPDX license expressions.
I've gone with the disjunctive `OR`, because the README has:
> Cargo is primarily distributed under the terms of both the MIT license and the Apache License (Version 2.0).
1
2
Cargo.toml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Cargo.toml
Simple merge