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: 792c1cf 9dd0cea)

author	Vasek Sraier <git@vakabus.cz>
	Tue, 10 Jan 2023 21:48:18 +0000 (22:48 +0100)
committer	Vasek Sraier <git@vakabus.cz>
	Tue, 10 Jan 2023 21:48:18 +0000 (22:48 +0100)
commit	362db46d8fcf51db1884bb18b30d36f10fba9ece
tree	98a6e1a9c6b8ee0110a6edbdfd05dfd55ccbc784	tree \| snapshot
parent	792c1cf80d3dbfeafd944ccb4be5faf79e1f7aa0	commit \| diff
parent	9dd0cea786377ca8e8e0d49815651b6496a6f175	commit \| diff

Merge branch 'master' into manager

.gitlab-ci.yml	diff1 \|	diff2 \|	blob \| history
distro/pkg/deb/control	diff1 \|	diff2 \|	blob \| history
distro/pkg/deb/rules	diff1 \|	diff2 \|	blob \| history
distro/pkg/rpm/knot-resolver.spec	diff1 \|	diff2 \|	blob \| history
doc/build.rst	diff1 \|	diff2 \|	blob \| history
doc/conf.py	diff1 \|	diff2 \|	blob \| history
doc/upgrading.rst	diff1 \|	diff2 \|	blob \| history
meson.build	diff1 \|	diff2 \|	blob \| history
meson_options.txt	diff1 \|	diff2 \|	blob \| history
modules/stats/stats.c	diff1 \|	diff2 \|	blob \| history

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