Fix some more merge conflicts and some improvements

2026-05-14 02:20:27 +02:00 · 2022-05-05 14:17:57 +02:00
parent f159ea8c3c
commit d36ad9b4e3
6 changed files with 16 additions and 83 deletions
@@ -3,5 +3,5 @@ config/**/*
 !config/**/*.default
 docker-compose.override.yml
 site.conf
-lading/*
+landing/*
 certs/*