git.ipfire.org Git - thirdparty/knot-resolver.git/commit

]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit

projects / thirdparty / knot-resolver.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5b2385f 36b5d20)

author	Oto Šťáva <oto.stava@nic.cz>
	Wed, 10 Apr 2024 11:19:27 +0000 (13:19 +0200)
committer	Oto Šťáva <oto.stava@nic.cz>
	Wed, 10 Apr 2024 11:19:53 +0000 (13:19 +0200)
commit	60411bb2b9cca259e1edd1189279e6d216e9b4bb
tree	1856352168b091e7784625a289dbd7e9ce6e7bcb	tree
parent	5b2385f72beb261d06b05895b1e2b7daa466bf32	commit \| diff
parent	36b5d203d8d25c289c6d70b046417fb848d4c9db	commit \| diff

Merge remote-tracking branch 'origin/master' into 6.0

.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
NEWS	diff1 \|	diff2 \|	blob \| history
daemon/engine.c	diff1 \|	diff2 \|	blob \| history
daemon/meson.build	diff1 \|	diff2 \|	blob \| history
meson.build	diff1 \|	diff2 \|	blob \| history
meson_options.txt	diff1 \|	diff2 \|	blob \| history
scripts/update-authors.sh	diff1 \|	diff2 \|	blob \| history

Mirror of https://gitlab.nic.cz/knot/knot-resolver.git