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 172a6419 authored 11 years ago by Jan Kadlec

Merge branch 'master' into new_node

Conflicts:
	src/knot/zone/zone-contents.c
	src/libknot/packet/pkt.c

parents e61408c4 6edd412a

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 358 additions and 25 deletions

Please register or to comment

Admin message

Merge branch 'master' into new_node