Fix some more merge conflicts and some improvements

This commit is contained in:
Patrick Skowronek
2022-05-05 14:17:57 +02:00
parent f159ea8c3c
commit d36ad9b4e3
6 changed files with 16 additions and 83 deletions

2
.gitignore vendored
View File

@ -3,5 +3,5 @@ config/**/*
!config/**/*.default
docker-compose.override.yml
site.conf
lading/*
landing/*
certs/*