diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-05-29 14:09:26 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-05-29 14:09:26 +0100 |
| commit | 28bb6bb3c0b4075bc45fcd9887af553fc3e0dfeb (patch) | |
| tree | db8d8613b1b10dfdcca97322b2c831c2c6db7924 | |
| parent | d0d9d53cd9d02334a5c0bdbc87c7e9d01212359e (diff) | |
| parent | 7f6e0d69a9100e92fe1bc782fb663bf3f294abc9 (diff) | |
| download | mullvadvpn-28bb6bb3c0b4075bc45fcd9887af553fc3e0dfeb.tar.xz mullvadvpn-28bb6bb3c0b4075bc45fcd9887af553fc3e0dfeb.zip | |
Merge branch 'fix-gui-settings-schema'
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index 56284fd061..5df6e9013a 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -206,8 +206,8 @@ const openVpnProxySchema = maybe( ); const bridgeSettingsSchema = oneOf( - partialObject({ location: locationConstraintSchema }), - openVpnProxySchema, + partialObject({ normal: partialObject({ location: locationConstraintSchema }) }), + partialObject({ custom: openVpnProxySchema }), ); const tunnelOptionsSchema = partialObject({ |