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

Merge branch 'master' into dnssec-over-ddns

Conflicts:
	src/knot/server/zones.c
parents 3a6d596f 5d08fc26
No related branches found
No related tags found
No related merge requests found
Showing
with 191 additions and 63 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