Unverified Commit 7b158c42 authored by Isis Lovecruft's avatar Isis Lovecruft
Browse files

Merge branch 'fix/12709-enable-fte' into develop

parents 4a9323d0 1a91efe6
......@@ -167,6 +167,7 @@ CURRENT_TRANSPORTS = [
"obfs2",
"obfs3",
"scramblesuit",
"fte",
]
EMAIL_SPRINTF = {
......
......@@ -90,11 +90,7 @@
<option label="obfs2" value="obfs2" >obfs2</option>
<option label="obfs3" value="obfs3" selected >obfs3</option>
<option label="scramblesuit" value="scramblesuit">scramblesuit</option>
<!-- XXX I think we should call it "fte" internally and in the bridge lines --
-- we return, and call it "fteproxy" when users are selecting it, because --
-- "fteproxy" likely has more "brandname recognition" due to --
-- https://fteproxy.org/ -->
<option label="fte" value="fte" disabled >fteproxy</option>
<option label="fte" value="fte" >fteproxy</option>
</select>
</div>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment