Skip to content
Snippets Groups Projects
Commit 688c1ce0 authored by Marek Vavrusa's avatar Marek Vavrusa
Browse files

Merge branch 'master' into packet-api-rewrite

Didn't port over the packet fixes that are already reworked in this
branch.

Conflicts:
	configure.ac
	src/knot/server/zones.c
	src/libknot/nameserver/name-server.c
	src/libknot/packet/packet.c
	src/libknot/packet/response.c
parents 5609e6cd ffc02e9d
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