Merge branch 'release/2.0' into release/2.0.0-pre.0

This commit is contained in:
Isis Lovecruft 2021-09-15 00:46:08 +00:00
commit 26c168b719
No known key found for this signature in database
GPG key ID: AB41313533E8E812
2 changed files with 2 additions and 2 deletions

View file

@ -4,7 +4,7 @@ on:
push:
branches: [ '*' ]
pull_request:
branches: [ main, develop ]
branches: [ main, develop, release ]
env:
CARGO_TERM_COLOR: always

View file

@ -35,7 +35,7 @@ features = ["nightly", "reusable_secrets", "serde"]
[dependencies]
curve25519-dalek = { version = "3", default-features = false }
rand_core = { version = "0.6", default-features = false, features = ["getrandom"] }
rand_core = { version = "0.6", default-features = false }
# `serde` is renamed to `our_serde` in order to avoid a name collision between
# importing the serde dependency and enabling the curve25519-dalek/serde feature
our_serde = { package = "serde", version = "1", default-features = false, optional = true, features = ["derive"] }