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 77882f7f authored 13 years ago by Lubos Slovak

Merge branch 'merge-me' into development

Conflicts:
	samples/example.com.zone
	src/Makefile.am
	src/dnslib/dnslib-error.c
	src/dnslib/error.h

parents 09d04d92 2cf0e335

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 1424 additions and 894 deletions

Please register or to comment

Admin message

Merge branch 'merge-me' into development