Skip to content
Snippets Groups Projects
Commit b7623c4d authored by Lubos Slovak's avatar Lubos Slovak
Browse files

Merge branch 'development' into axfr-in

Conflicts:
	Knot.files
	src/Makefile.am
	src/dnslib/zone.c
	src/dnslib/zone.h
	src/knot/server/name-server.c
parents bd21b652 77882f7f
No related branches found
No related tags found
No related merge requests found
Showing
with 1383 additions and 841 deletions
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