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

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

Conflicts:
	src/knot/server/server.c
	src/knot/server/socket.c
parents d85c4d89 ea5c4f1f
No related branches found
No related tags found
No related merge requests found
Showing with 205 additions and 165 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