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

Merge remote-tracking branch 'origin/master' into chain-fix-take2

Conflicts:
	src/libknot/dnssec/zone-events.c
parents 0e2c5abd ec5309dd
No related branches found
No related tags found
2 merge requests!123DNSSEC - NSEC/NSEC3 chain fix,!122DNSSEC: NSEC/NSEC3 chain fixing
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