Skip to content
Snippets Groups Projects
Commit b6347be9 authored by Marek Vavruša's avatar Marek Vavruša
Browse files

Merge branch 'master' into resolver_compat 

Conflicts:
	Knot.files
	src/knot/nameserver/update.c
	src/knot/nameserver/update.h
	src/knot/server/tcp-handler.c
	src/knot/zone/events.c
	src/knot/zone/zone.c
	src/knot/zone/zone.h
	src/libknot/packet/net.c
	src/libknot/rdataset.c
	src/utils/nsupdate/nsupdate_params.h
parent 4c01e33e
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 33 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment