diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-02-14 10:56:12 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-02-14 10:56:12 +0100 |
| commit | 565334a1e8edba8b2285704b92f295a7af2e6587 (patch) | |
| tree | 32956090d9e445b81d01a1ea35a6e5eaa2c8bb52 | |
| parent | b4a4b0881353bb952f4019b4eaea0c6c71e1388e (diff) | |
| parent | f01d1b4630cc83e46c371a1416ed9900ac8e9001 (diff) | |
| download | mullvadvpn-565334a1e8edba8b2285704b92f295a7af2e6587.tar.xz mullvadvpn-565334a1e8edba8b2285704b92f295a7af2e6587.zip | |
Merge branch 'bump-binaries-repo-with-shadowsocks'
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | Cargo.toml | 1 | ||||
| m--------- | dist-assets/binaries | 0 |
3 files changed, 3 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock index 3bb867efd5..f868e60fe9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,3 +1,5 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. [[package]] name = "aho-corasick" version = "0.6.9" diff --git a/Cargo.toml b/Cargo.toml index 8e68361379..20d61b7d1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,3 +12,4 @@ members = [ "talpid-core", "talpid-ipc", ] +exclude = ["dist-assets/binaries/shadowsocks-rust"]
\ No newline at end of file diff --git a/dist-assets/binaries b/dist-assets/binaries -Subproject a3d23d96a4d45ea28e86927fc885baec09073c4 +Subproject c700c8b968415a0f398051c914dc7cc89317f87 |