Merge branch 'main' into develop

This commit is contained in:
Isis Lovecruft 2022-02-16 20:55:36 +00:00
commit 8abb22bcaf
No known key found for this signature in database
GPG key ID: AB41313533E8E812
2 changed files with 2 additions and 2 deletions

View file

@ -50,7 +50,7 @@ serde = { version = "1.0", default-features = false, optional = true, features =
# The original packed_simd package was orphaned, see
# https://github.com/rust-lang/packed_simd/issues/303#issuecomment-701361161
packed_simd = { version = "0.3.4", package = "packed_simd_2", features = ["into_bits"], optional = true }
zeroize = { version = "=1.3.0", default-features = false }
zeroize = { version = ">=1, <1.4", default-features = false }
fiat-crypto = { version = "0.1.6", optional = true}
[features]

View file

@ -177,7 +177,7 @@ that primitive.
Please see [CONTRIBUTING.md][contributing].
Patches and pull requests should be make against the `develop`
branch, **not** `master`.
branch, **not** `main`.
# About