Merge branch 'master' into v1

This commit is contained in:
AJ ONeal 2018-08-08 02:31:46 -06:00
commit 4a1f020100
2 ha cambiato i file con 2 aggiunte e 1 eliminazioni

Vedi File

@ -5,6 +5,7 @@ Because friends don't let friends localhost™
| Sponsored by [ppl](https://ppl.family)
| **Telebit Remote**
| [Telebit Relay](https://git.coolaj86.com/coolaj86/telebit-relay.js)
| [sclient](https://telebit.cloud/sclient)
|
<img align="center" src="https://git.coolaj86.com/coolaj86/telebit.js/raw/branch/master/usr/share/docs/terminal-example-1.png">

Vedi File

@ -166,7 +166,7 @@ function askForConfig(state, mainCb) {
});
}
if (state.config.relay) { checkRelay(); return; }
if (state.config.relay) { checkRelay(state.config.relay); return; }
console.info("");
console.info("");
console.info("What relay will you be using? (press enter for default)");