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

Merge branch 'master' into merge-nameserver-server

Conflicts:
	src/knot/nameserver/name-server.c
	src/knot/nameserver/update.c
	src/knot/zone/zonedb.c

parents 92a1c068 c814c232

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 20 additions and 22 deletions

Please register or to comment

Admin message

Merge branch 'master' into merge-nameserver-server