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

Merge branch 'rrset' into rrset_owner_shared

Conflicts:
	src/libknot/updates/changesets.c
	src/libknot/updates/ddns.c
	src/libknot/updates/xfr-in.c
parents ae2528c3 b9d2e3db
Showing
with 906 additions and 1570 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