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

Merge branch 'master' into dnssec-reload

Conflicts:
	src/knot/server/zones.c
parents 79408f7f fdc58c15
No related branches found
No related tags found
1 merge request!176DNSSEC signing after (re)load fixed
Showing
with 576 additions and 515 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