merge resolve

This commit is contained in:
Fouad
2022-12-21 12:56:40 +00:00
committed by farbanas
parent 29f48efe49
commit 9684b7ffbd
2 changed files with 23 additions and 2 deletions
Generated
+22 -1
View File
@@ -1778,6 +1778,9 @@ dependencies = [
"network-defaults",
"okapi",
"pretty_env_logger",
"rand 0.8.5",
"rand_pcg 0.3.1",
"rand_seeder",
"reqwest",
"rocket",
"rocket_cors",
@@ -4390,7 +4393,7 @@ dependencies = [
"rand_isaac",
"rand_jitter",
"rand_os",
"rand_pcg",
"rand_pcg 0.1.2",
"rand_xorshift",
"winapi",
]
@@ -4554,6 +4557,24 @@ dependencies = [
"rand_core 0.4.2",
]
[[package]]
name = "rand_pcg"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e"
dependencies = [
"rand_core 0.6.3",
]
[[package]]
name = "rand_seeder"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf2890aaef0aa82719a50e808de264f9484b74b442e1a3a0e5ee38243ac40bdb"
dependencies = [
"rand_core 0.6.3",
]
[[package]]
name = "rand_xorshift"
version = "0.1.1"
+1 -1
View File
@@ -2876,7 +2876,7 @@ dependencies = [
[[package]]
name = "nym_wallet"
version = "1.1.3"
version = "1.1.5"
dependencies = [
"aes-gcm",
"argon2 0.3.4",