diff options
| author | cyberta <cyberta@riseup.net> | 2022-07-19 17:26:25 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-07-19 17:26:25 +0000 |
| commit | 6bc3a79e6d09a8fa1857f1d502a87c1c0633be35 (patch) | |
| tree | 7aa914e63bb6aae27c8521dd198e3f7416e9890c /app/src/main/res | |
| parent | abd8c8d06f01cc5b794a18779c2ea36b9317b4e3 (diff) | |
| parent | 4a95fbad79333bc1cc83b22c8122293a3d8d332f (diff) | |
Merge branch 'integrate_obfsvpn' into 'master'
update bitmaskcore, integrating obfsvpn
See merge request leap/bitmask_android!190
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/f_settings.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/src/main/res/layout/f_settings.xml b/app/src/main/res/layout/f_settings.xml index 7b8733cd..f89dc956 100644 --- a/app/src/main/res/layout/f_settings.xml +++ b/app/src/main/res/layout/f_settings.xml @@ -114,5 +114,14 @@ app:subtitle="Connect to a specific Gateway for debugging purposes" /> + <se.leap.bitmaskclient.base.views.IconSwitchEntry + android:id="@+id/experimental_transports" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:text="Experimental transports" + app:singleLine="false" + app:subtitle="These transports might circumvent censorship, but are still in a testing phase" + /> + </LinearLayout> </ScrollView>
\ No newline at end of file |