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 1ee49dab authored 11 years ago by Marek Vavrusa

Merge branch 'master' into dname_refactor

Conflicts:
	src/knot/zone/zone-load.c
	src/tests/xfr_tests.c

parents c42eb356 90fb5d03

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 505 additions and 198 deletions

Please register or to comment

Admin message

Merge branch 'master' into dname_refactor