Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
hdevalence committed Aug 18, 2020
2 parents b8e6fb7 + d438d48 commit fd12c03
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,10 @@

Entries are listed in reverse chronological order.

## 1.0.1

* Update underlying `curve25519_dalek` library to `3.0`.

## 1.0.0

* Widen generic bound on `EphemeralSecret::new` and `StaticSecret::new` to
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -5,7 +5,7 @@ edition = "2018"
# - update version in README.md
# - update html_root_url
# - update CHANGELOG
version = "1.0.0"
version = "1.0.1"
authors = [
"Isis Lovecruft <isis@patternsinthevoid.net>",
"DebugSteven <debugsteven@gmail.com>",
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Expand Up @@ -20,7 +20,7 @@
#![cfg_attr(feature = "nightly", deny(missing_docs))]
#![cfg_attr(feature = "nightly", doc(include = "../README.md"))]
#![doc(html_logo_url = "https://doc.dalek.rs/assets/dalek-logo-clear.png")]
#![doc(html_root_url = "https://docs.rs/x25519-dalek/1.0.0")]
#![doc(html_root_url = "https://docs.rs/x25519-dalek/1.0.1")]

//! Note that docs will only build on nightly Rust until
//! `feature(external_doc)` is stabilized.
Expand Down

0 comments on commit fd12c03

Please sign in to comment.