Merge branch 'main' into suggest-english

This commit is contained in:
Kristoffer Dalby 2022-04-21 09:13:08 +01:00 committed by GitHub
commit ffa570e877
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions

4
.gitignore vendored
View file

@ -27,3 +27,7 @@ derp.yaml
.idea .idea
test_output/ test_output/
# Nix and direnv
.direnv/
result

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/xGj2TuqyxY) server for a chat. Join our [Discord](https://discord.gg/c84AZQhmpx) 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.

View file

@ -3,7 +3,7 @@
This page contains the official and community contributed documentation for `headscale`. This page contains the official and community contributed documentation for `headscale`.
If you are having trouble with following the documentation or get unexpected results, If you are having trouble with following the documentation or get unexpected results,
please ask on [Discord](https://discord.gg/XcQxk2VHjx) instead of opening an Issue. please ask on [Discord](https://discord.gg/c84AZQhmpx) instead of opening an Issue.
## Official documentation ## Official documentation