diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-09-02 16:48:24 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-09-02 16:48:24 +0200 |
| commit | df60feed904377a31bf510aad94ba251c81c4324 (patch) | |
| tree | 7de555d471d67485d8c420583941b0a69e579398 /gui/src/shared | |
| parent | 4fdd915587a966fc77bbd61df7a26578615419bf (diff) | |
| parent | 31ae28ff4f619f47fd364ff601dec648e8d27226 (diff) | |
| download | mullvadvpn-df60feed904377a31bf510aad94ba251c81c4324.tar.xz mullvadvpn-df60feed904377a31bf510aad94ba251c81c4324.zip | |
Merge branch 'add-set-bridge-settings'
Diffstat (limited to 'gui/src/shared')
| -rw-r--r-- | gui/src/shared/daemon-rpc-types.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts index 61a0263031..f88cd29404 100644 --- a/gui/src/shared/daemon-rpc-types.ts +++ b/gui/src/shared/daemon-rpc-types.ts @@ -311,7 +311,7 @@ export interface IBridgeConstraints { }; } -export type BridgeSettings = ProxySettings | IBridgeConstraints; +export type BridgeSettings = { normal: IBridgeConstraints } | { custom: ProxySettings }; export interface ISocketAddress { host: string; |