Skip to content
Snippets Groups Projects
Commit 52844dc9 authored by Jan Kadlec's avatar Jan Kadlec
Browse files

Merge remote branch 'origin/nsec3' into dnslib-new

Conflicts:
	Knot.files
	Makefile
	src/tests/dnslib/dnslib_response_tests.c
	src/tests/unittests_main.c
parents 4ca3b631 8be2db89
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment