Merge branch 'master' into next

This commit is contained in:
AJ ONeal 2018-09-25 01:29:28 -06:00
bovenliggende 6c9d13f155 3678c871cf
commit 68dac05d47
1 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen

Bestand weergeven

@ -72,7 +72,7 @@ ssh -o ProxyCommand="$proxy_cmd" <span class="js-servername">{{servername}}</spa
<pre><code>ssh -o ProxyCommand='openssl s_client -connect %h:443 -servername %h -quiet' <span class="js-servername">{{servername}}</span></code></pre>
<div class="js-port" hidden>
<!--div class="js-port" hidden>
<h2>You've claimed port <span class="js-serviceport">{{serviceport}}</span></h2>
<p>Here's some ways you can use it:</p>
<div class="code-block"><pre><code>telebit tcp 3000 # forward all tcp traffic to localhost:3000
@ -83,7 +83,7 @@ telebit tcp none # remove all tcp handlers</code></pre>
<div class="code-block"><pre><code>telebit ssh 22
ssh <span class="js-servername">{{servername}}</span> -p <span class="js-serviceport">{{serviceport}}</span></code></pre></div>
</div>
</div -->
<script src="js/app.js"></script>
</body>