Skip to content

Commit

Permalink
Merge #605
Browse files Browse the repository at this point in the history
605: Change crossbeam-queue's license to MIT OR Apache-2.0 r=taiki-e a=taiki-e

See #536 and #537 for more. `crossbeam-queue` has the same issue.

Co-authored-by: Taiki Endo <te316e89@gmail.com>
  • Loading branch information
bors[bot] and taiki-e committed Nov 22, 2020
2 parents ccbad40 + 9636ac9 commit a01bb96
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crossbeam-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = "crossbeam-queue"
version = "0.3.0"
authors = ["The Crossbeam Project Developers"]
edition = "2018"
license = "MIT AND BSD-2-Clause OR Apache-2.0 AND BSD-2-Clause"
license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/crossbeam-rs/crossbeam"
homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils"
Expand Down

0 comments on commit a01bb96

Please sign in to comment.