]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge remote-tracking branch 'master' into rrl-wip docs-develop-rrl-8r8r8r/deployments/5381
authorLukáš Ondráček <lukas.ondracek@nic.cz>
Mon, 21 Oct 2024 17:48:46 +0000 (19:48 +0200)
committerLukáš Ondráček <lukas.ondracek@nic.cz>
Mon, 21 Oct 2024 17:49:14 +0000 (19:49 +0200)
1  2 
.gitlab-ci.yml
meson.build
python/knot_resolver/datamodel/config_schema.py
python/knot_resolver/datamodel/logging_schema.py
python/knot_resolver/manager/manager.py

diff --cc .gitlab-ci.yml
Simple merge
diff --cc meson.build
Simple merge