Merge #87

87: Release 0.3.1 r=cuviper a=cuviper



Co-authored-by: Josh Stone <cuviper@gmail.com>

Author: bors[bot]

Cargo.toml

@@ -5,10 +5,10 @@ documentation = "https://docs.rs/num-complex"
 homepage = "https://github.com/rust-num/num-complex"
 keywords = ["mathematics", "numerics"]
 categories = ["algorithms", "data-structures", "science", "no-std"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 name = "num-complex"
 repository = "https://github.com/rust-num/num-complex"
-version = "0.3.0"
+version = "0.3.1"
 readme = "README.md"
 exclude = ["/bors.toml", "/ci/*", "/.github/*"]
 edition = "2018"

README.md

@@ -38,3 +38,18 @@ Release notes are available in [RELEASES.md](RELEASES.md).
 ## Compatibility
 
 The `num-complex` crate is tested for rustc 1.31 and greater.
+
+## License
+
+Licensed under either of
+
+ * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0)
+ * [MIT license](http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.

RELEASES.md

@@ -1,3 +1,9 @@
+# Release 0.3.1 (2020-10-29)
+
+- Clarify the license specification as "MIT OR Apache-2.0".
+
+**Contributors**: @cuviper
+
 # Release 0.3.0 (2020-06-13)
 
 ### Enhancements