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

Merge branch 'ldns-to-dnslib' into dnslib-slab

Conflicts:
	src/zone/parser-util.h
	src/zone/zone-load.c
parents dbce9f95 97cd807d
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