Merge branch 'master' into branch-1.4prep (1bd6f345) · Commits · Knot projects / Knot DNS

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

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 1bd6f345 authored 11 years ago by

Daniel Salzman

Browse files

Merge branch 'master' into branch-1.4prep

Conflicts:
	src/Makefile.am
	src/knot/main.c
	src/knot/zone/zone-load.c

parents e03a59f2 b898484a

Branches

Admin message

Admin message

Merge branch 'master' into branch-1.4prep