CHANGELOG: Add entry for crate merge

multiformats · May 20, 2021 · 5b6ca54 · 5b6ca54
1 parent bb718bd
commit 5b6ca54
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 0.12.0 [unreleased]
+
+- Merge  [multiaddr] and [parity-multiaddr] (see [PR 40]).
+
+[multiaddr]: https://github.com/multiformats/rust-multiaddr
+[parity-multiaddr]: https://github.com/libp2p/rust-libp2p/blob/master/misc/multiaddr/
+[PR 40]: https://github.com/multiformats/rust-multiaddr/pull/40
+
 # 0.11.2 [2021-03-17]
 
 - Add `Multiaddr::ends_with()`.