Self sign-up has been disabled due to increased spam activity. If you want to get access, please send an email to a project owner (preferred) or at gitlab(at)nic(dot)cz. We apologize for the inconvenience.

Commit ae807ae3 authored 11 years ago by Jan Kadlec

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

Conflicts:
	src/knot/server/zones.c
	src/libknot/dnssec/zone-events.c
	src/libknot/dnssec/zone-keys.c

parents ef98e0c8 459517ce

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 419 additions and 339 deletions

Please register or to comment

Admin message

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