diff --git a/Cargo.toml b/Cargo.toml index 8c4719b92..146c4004f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ documentation = "https://docs.rs/actix-web/" categories = ["network-programming", "asynchronous", "web-programming::http-server", "web-programming::websocket"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [package.metadata.docs.rs] diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml index 12fd03ce1..b7ba75960 100644 --- a/actix-files/Cargo.toml +++ b/actix-files/Cargo.toml @@ -9,7 +9,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-web.git" documentation = "https://docs.rs/actix-files/" categories = ["asynchronous", "web-programming::http-server"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index a9bec59de..232b5c3f0 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -11,7 +11,7 @@ documentation = "https://docs.rs/actix-http/" categories = ["network-programming", "asynchronous", "web-programming::http-server", "web-programming::websocket"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [package.metadata.docs.rs] diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml index c5f315d75..f6d6a37a1 100644 --- a/actix-multipart/Cargo.toml +++ b/actix-multipart/Cargo.toml @@ -8,7 +8,7 @@ keywords = ["http", "web", "framework", "async", "futures"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-web.git" documentation = "https://docs.rs/actix-multipart/" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml index 746aca2d5..7383b2032 100644 --- a/actix-web-actors/Cargo.toml +++ b/actix-web-actors/Cargo.toml @@ -8,7 +8,7 @@ keywords = ["actix", "http", "web", "framework", "async"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-web.git" documentation = "https://docs.rs/actix-web-actors/" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml index 178eeeb7e..10c33ea74 100644 --- a/actix-web-codegen/Cargo.toml +++ b/actix-web-codegen/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-web" documentation = "https://docs.rs/actix-web-codegen" authors = ["Nikolay Kim "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/awc/Cargo.toml b/awc/Cargo.toml index e0f89c8dc..73dc6e0e5 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -11,7 +11,7 @@ documentation = "https://docs.rs/awc/" categories = ["network-programming", "asynchronous", "web-programming::http-client", "web-programming::websocket"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml index aeb40daee..3b3c8e91e 100644 --- a/test-server/Cargo.toml +++ b/test-server/Cargo.toml @@ -11,7 +11,7 @@ documentation = "https://docs.rs/actix-http-test/" categories = ["network-programming", "asynchronous", "web-programming::http-server", "web-programming::websocket"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" exclude = [".gitignore", ".cargo/config"] edition = "2018"