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

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

Conflicts:
	src/dnslib/zone-load.c
	src/tests/dnslib/dnslib_response_tests.c
parents 5df78f86 48e4a7ff
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