Merge remote-tracking branch 'origin/master' into clients-patch

This commit is contained in:
kevin 2022-12-21 10:46:09 +08:00
commit b37c0a7f5b
11 changed files with 157 additions and 106 deletions

View file

@ -214,7 +214,7 @@
<summary><strong>Public and Preshared Keys</strong>
<i class="fas fa-info-circle" data-toggle="tooltip"
data-original-title="If you don't want to let the server generate and store the
client's private, you can manually specify its public and preshared key here
client's private key, you can manually specify its public and preshared key here
. Note: QR code will not be generated">
</i>
</summary>
@ -228,7 +228,7 @@
<label for="client_preshared_key" class="control-label">
Preshared Key
</label>
<input type="text" class="form-control" id="client_preshared_key" name="client_preshared_key" placeholder="Autogenerated">
<input type="text" class="form-control" id="client_preshared_key" name="client_preshared_key" placeholder="Autogenerated - enter &quot;-&quot; to skip generation">
</div>
</details>
</div>