Skip to content

Commit

Permalink
Merge #1457
Browse files Browse the repository at this point in the history
1457: Cargo.toml: Bump license-exprs to 1.4.0 r=carols10cents

And then update `Cargo.lock` with:

```console
$ cargo build
```

This bumps us from the SPDX License List 2.4 to 3.1.  Some 2.4 identifiers have since been deprecated by SPDX, but none of them have been removed, so it should be safe to deploy this before bumping Cargo and its docs (which mention 2.4 since rust-lang/cargo#4898).

Fixes #1278.
  • Loading branch information
bors-voyager[bot] committed Jul 11, 2018
2 parents 0666318 + 45217ad commit 50cc1d4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ log = "0.3"
env_logger = "0.5"
hex = "0.3"
htmlescape = "0.3.1"
license-exprs = "^1.3"
license-exprs = "^1.4"
dotenv = "0.11.0"
toml = "0.4"
diesel = { version = "1.3.0", features = ["postgres", "serde_json", "chrono", "r2d2"] }
Expand Down

0 comments on commit 50cc1d4

Please sign in to comment.