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

Merge branch 'master' into zone-events-queue

Conflicts:
	src/knot/dnssec/zone-sign.c
	src/knot/nameserver/axfr.c
	src/knot/nameserver/internet.c
	src/knot/nameserver/notify.c
	src/knot/nameserver/nsec_proofs.c
	src/knot/server/xfr-handler.c
	src/knot/server/zone-load.c
	src/knot/server/zones.c
	src/knot/updates/ddns.c
	src/knot/updates/xfr-in.c
	src/knot/zone/contents.c
	src/knot/zone/contents.h
	src/knot/zone/semantic-check.c
	src/knot/zone/semantic-check.h
	src/knot/zone/zone-diff.c
	src/knot/zone/zonefile.c
	tests/process_query.c
parents decdc3a2 76b3dbcc
No related branches found
No related tags found
No related merge requests found
Showing
with 155 additions and 147 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