diff --git a/Cargo.toml b/Cargo.toml index 8b64f7b24..93d6231da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "actix-redis" version = "0.1.0" authors = ["Nikolay Kim "] -description = "Redis integration for actix web framework" +description = "Redis integration for actix framework" license = "MIT/Apache-2.0" readme = "README.md" keywords = ["http", "web", "framework", "async", "actix"] diff --git a/README.md b/README.md index c2d500259..9e0a7b7fe 100644 --- a/README.md +++ b/README.md @@ -41,3 +41,18 @@ fn main() { let _ = sys.run(); } ``` + +## License + +This project is licensed under either of + +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT)) + +at your option. + +## Code of Conduct + +Contribution to the actix-web crate is organized under the terms of the +Contributor Covenant, the maintainer of actix-redis, @fafhrd91, promises to +intervene to uphold that code of conduct.