Skip to content

Commit

Permalink
Merge branch 'master' into min-rust-version-in-toml
Browse files Browse the repository at this point in the history
  • Loading branch information
stanislav-tkach committed Dec 20, 2022
2 parents bbcd770 + 3c2f3a3 commit d337860
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cli/Cargo.toml
Expand Up @@ -20,7 +20,7 @@ path = "src/main.rs"
[dependencies]
os_info = { version = "3.5.1", default-features = false, path = "../os_info" }
log = "0.4.5"
env_logger = "0.9"
env_logger = "0.10"
clap = { version = "4", features = ["derive"] }

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions deny.toml
Expand Up @@ -66,15 +66,15 @@ ignore = [
[licenses]
# The lint level for crates which do not have a detectable license
unlicensed = "deny"
# List of explictly allowed licenses
# List of explicitly allowed licenses
# See https://spdx.org/licenses/ for list of possible licenses
# [possible values: any SPDX 3.7 short identifier (+ optional exception)].
allow = [
"MIT",
"Apache-2.0",
"Unicode-DFS-2016",
]
# List of explictly disallowed licenses
# List of explicitly disallowed licenses
# See https://spdx.org/licenses/ for list of possible licenses
# [possible values: any SPDX 3.7 short identifier (+ optional exception)].
deny = [
Expand Down

0 comments on commit d337860

Please sign in to comment.