]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
projects / thirdparty / knot-resolver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa8bdbc 5b1bf03)
Merge remote-tracking branch 'origin/master' into doc-logo-manual-colors-6 docs-develop-6-0-mvwoqi/deployments/3040 docs-develop-doc-440x4h/deployments/3039
authorOto Šťáva <oto.stava@nic.cz>
Mon, 15 Jan 2024 21:52:56 +0000 (22:52 +0100)
committerOto Šťáva <oto.stava@nic.cz>
Mon, 15 Jan 2024 21:52:56 +0000 (22:52 +0100)
1  2 
doc/conf.py patch | diff1 | diff2 | blob | history

diff --cc doc/conf.py
Simple merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git