Skip to content
Snippets Groups Projects
Commit a4bc270b authored by Lubos Slovak's avatar Lubos Slovak
Browse files

Merge branch 'libknot' of git+ssh://git.nic.cz/projects/labs/cutedns into libknot

Conflicts:
	src/knot/server/zones.c
parents ea8a4aa0 0caaafb2
Branches
Tags
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