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

Merge remote-tracking branch 'origin/new-ixfr' into development

Conflicts:
	src/libknot/nameserver/name-server.h
parents 273b7841 f6c6c706
No related branches found
No related tags found
No related merge requests found
Showing
with 1261 additions and 901 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