Skip to content
Snippets Groups Projects
Commit 3dd9ef4c authored by Marek Vavruša's avatar Marek Vavruša
Browse files

Merge branch 'master' into rdataset_rename

Conflicts:
	src/knot/zone/semantic-check.c
parents 6b17ddfb afc2d0a5
Branches
Tags
No related merge requests found
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment