Jens Langhammer 476e57daa2 Merge branch 'version-2021.4' ... Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org> # Conflicts: # docker-compose.yml # website/docs/installation/kubernetes.md		2021-04-17 16:01:35 +02:00
..
beta.mdx	docs: prepare changelog for 2021.4	2021-04-10 21:08:20 +02:00
docker-compose-config.md	website: add docs for compose configuration options	2021-03-12 16:43:31 +01:00
docker-compose.md	Merge branch 'version-2021.4'	2021-04-17 16:01:35 +02:00
index.md	docs: add beta opt-in docs	2021-03-12 18:04:42 +01:00
kubernetes.md	Merge branch 'version-2021.4'	2021-04-17 16:01:35 +02:00
reverse-proxy.md	wip: rename to authentik (#361)	2020-12-05 22:08:42 +01:00