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 850b0f58 authored 10 years ago by Jan Kadlec

Merge remote-tracking branch 'origin/master' into changeset-refactor

Conflicts:
	Knot.files
	src/knot/nameserver/update.c
	src/knot/zone/zone-load.c
	src/knot/zone/zone.c
	src/knot/zone/zone.h

parents 3e41a980 a89efd15

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing with 252 additions and 28 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/master' into changeset-refactor