Merge branch 'main' into makefile-improvements

This commit is contained in:
Kristoffer Dalby 2022-04-12 17:00:30 +01:00 committed by GitHub
commit 93682ab708
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -7,5 +7,5 @@ contact_links:
url: "https://github.com/juanfont/headscale/blob/main/docs" url: "https://github.com/juanfont/headscale/blob/main/docs"
about: "Find documentation about how to configure and run headscale." about: "Find documentation about how to configure and run headscale."
- name: "headscale Discord community" - name: "headscale Discord community"
url: "https://discord.com/invite/XcQxk2VHjx" url: "https://discord.gg/xGj2TuqyxY"
about: "Please ask and answer questions about usage of headscale here." about: "Please ask and answer questions about usage of headscale here."

View file

@ -4,7 +4,7 @@
An open source, self-hosted implementation of the Tailscale control server. An open source, self-hosted implementation of the Tailscale control server.
Join our [Discord](https://discord.gg/XcQxk2VHjx) server for a chat. Join our [Discord](https://discord.gg/xGj2TuqyxY) server for a chat.
**Note:** Always select the same GitHub tag as the released version you use **Note:** Always select the same GitHub tag as the released version you use
to ensure you have the correct example configuration and documentation. to ensure you have the correct example configuration and documentation.