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

Merge branch 'rrset' into rrset_owner_shared

Conflicts:
	src/libknot/dname.c
parents 0ac41bfe 8e0bbdcb
No related merge requests found
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