diff --git a/Cargo.toml b/Cargo.toml index 59eb9aef6..16daf439c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,9 +49,9 @@ tokio-proto = "0.1" h2 = { git = 'https://github.com/carllerche/h2', optional = true } [dependencies.actix] +version = "0.3" #path = "../actix" -git = "https://github.com/actix/actix.git" -#version = "0.2" +#git = "https://github.com/actix/actix.git" default-features = false features = [] diff --git a/README.md b/README.md index 8195119cd..8df32bfe4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Actix web [![Build Status](https://travis-ci.org/actix/actix-web.svg?branch=master)](https://travis-ci.org/actix/actix-web) [![Build Status](https://ci.appveyor.com/api/projects/status/github/fafhrd91/actix-web-hdy9d?branch=master&svg=true)](https://ci.appveyor.com/project/fafhrd91/actix-web-hdy9d) [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) +# Actix web [![Build Status](https://travis-ci.org/actix/actix-web.svg?branch=master)](https://travis-ci.org/actix/actix-web) [![Build status](https://ci.appveyor.com/api/projects/status/kkdb4yce7qhm5w85/branch/master?svg=true)](https://ci.appveyor.com/project/fafhrd91/actix-web-hdy9d/branch/master) [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) Web framework for [Actix](https://github.com/actix/actix). diff --git a/examples/multipart/Cargo.toml b/examples/multipart/Cargo.toml index 5ea4d9d49..e1f6ea8c4 100644 --- a/examples/multipart/Cargo.toml +++ b/examples/multipart/Cargo.toml @@ -9,6 +9,6 @@ path = "src/main.rs" [dependencies] env_logger = "*" -# actix = "0.2" -actix = { git = "https://github.com/actix/actix.git" } +actix = "0.3" +#actix = { git = "https://github.com/actix/actix.git" } actix-web = { path = "../../" } diff --git a/examples/websocket-chat/Cargo.toml b/examples/websocket-chat/Cargo.toml index 5915a0e5f..3495d63c9 100644 --- a/examples/websocket-chat/Cargo.toml +++ b/examples/websocket-chat/Cargo.toml @@ -24,6 +24,6 @@ serde = "1.0" serde_json = "1.0" serde_derive = "1.0" -actix = { git = "https://github.com/actix/actix.git" } -# actix = { path = "../../../actix" } +actix = "0.3" +#actix = { git = "https://github.com/actix/actix.git" } actix-web = { path = "../../" }