Skip to content
Snippets Groups Projects
Commit 504192a6 authored by Jan Včelák's avatar Jan Včelák :rocket:
Browse files

Merge remote-tracking branch 'origin/ddns-sec' into review-dnssec 

Conflicts:
	src/libknot/dnssec/zone-events.c
	src/libknot/dnssec/zone-keys.c
	src/libknot/dnssec/zone-nsec.c
	src/libknot/dnssec/zone-sign.c

refs #4
parents c62f4702 7ec00f04
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 568 additions and 806 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment