diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-08-14 22:18:21 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-08-14 22:18:21 +0200 |
| commit | bcd21a7e071b2766c5645fb699570551a8fd42bb (patch) | |
| tree | d79c6bd1fab9d8844bf27e6f61780d8ceb1ecce9 | |
| parent | 030b60046b073fe125eedbfcc56deeddf3ebe44a (diff) | |
| parent | b6dea414151b245e77b79212389b3a17893d0c24 (diff) | |
| download | mullvadvpn-bcd21a7e071b2766c5645fb699570551a8fd42bb.tar.xz mullvadvpn-bcd21a7e071b2766c5645fb699570551a8fd42bb.zip | |
Merge branch 'release-2018.2-changes'
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | Cargo.lock | 6 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | mullvad-cli/Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad-problem-report/Cargo.toml | 2 | ||||
| -rw-r--r-- | package.json | 2 |
7 files changed, 12 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 808639b6a8..a91ed2c011 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,10 @@ Line wrap the file at 100 chars. Th having a create account form first. +## [2018.2] - 2018-08-13 +This release is identical to 2018.2-beta3 + + ## [2018.2-beta3] - 2018-08-09 ### Added - Create a new UI log file for every UI execution session, and preserve the log from the previous diff --git a/Cargo.lock b/Cargo.lock index 6074e9b516..4a1906e281 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -811,7 +811,7 @@ dependencies = [ [[package]] name = "mullvad-cli" -version = "2018.2.0-beta3" +version = "2018.2.0" dependencies = [ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -826,7 +826,7 @@ dependencies = [ [[package]] name = "mullvad-daemon" -version = "2018.2.0-beta3" +version = "2018.2.0" dependencies = [ "chrono 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -885,7 +885,7 @@ dependencies = [ [[package]] name = "mullvad-problem-report" -version = "2018.2.0-beta3" +version = "2018.2.0" dependencies = [ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -18,7 +18,7 @@ source env.sh if [[ "${1:-""}" != "--dev-build" ]]; then - REQUIRED_RUSTC_VERSION="rustc 1.27.2 (58cc626de 2018-07-18)" + REQUIRED_RUSTC_VERSION="rustc 1.28.0 (9634041f0 2018-07-30)" if [[ $RUSTC_VERSION != $REQUIRED_RUSTC_VERSION ]]; then echo "You are running the wrong Rust compiler version." diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml index b7e46d8f2a..7f9b39d92e 100644 --- a/mullvad-cli/Cargo.toml +++ b/mullvad-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mullvad-cli" -version = "2018.2.0-beta3" +version = "2018.2.0" authors = ["Mullvad VPN <admin@mullvad.net>", "Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>", "Andrej Mihajlov <and@mullvad.net>"] description = "Manage the Mullvad VPN daemon via a convenient CLI" license = "GPL-3.0" diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index 147bc0b1e1..482b353049 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mullvad-daemon" -version = "2018.2.0-beta3" +version = "2018.2.0" authors = ["Mullvad VPN <admin@mullvad.net>", "Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>", "Andrej Mihajlov <and@mullvad.net>"] description = "Mullvad VPN daemon. Runs and controls the VPN tunnels" license = "GPL-3.0" diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml index bd054b4ba7..eb9ed185ae 100644 --- a/mullvad-problem-report/Cargo.toml +++ b/mullvad-problem-report/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mullvad-problem-report" -version = "2018.2.0-beta3" +version = "2018.2.0" authors = ["Mullvad VPN <admin@mullvad.net>", "Linus Färnstrand <linus@mullvad.net>", "Andrej Mihajlov <and@mullvad.net>"] description = "Collect Mullvad VPN logs into a report and send it to support" license = "GPL-3.0" diff --git a/package.json b/package.json index 8d598fe042..d570c5effe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mullvad-vpn", - "version": "2018.2.0-beta3", + "version": "2018.2.0", "productName": "Mullvad VPN", "description": "Mullvad VPN client", "main": "init.js", |