Skip to content
Snippets Groups Projects
Commit 3ced72ab authored by Jan Kadlec's avatar Jan Kadlec
Browse files

Merge remote-tracking branch 'origin/master' into rr_refactor

Conflicts:
	src/libknot/dnssec/zone-nsec.c
parents 9d55360a 51882e74
No related branches found
No related tags found
No related merge requests found
Showing
with 2690 additions and 336 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