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

Merge branch 'master' into new_node

Conflicts:
	src/knot/dnssec/zone-sign.c
	src/knot/updates/ddns.c
	src/knot/updates/xfr-in.c
	src/knot/zone/node.c
	src/knot/zone/node.h
	src/knot/zone/semantic-check.c
	src/knot/zone/zone-contents.c
	src/knot/zone/zone-contents.h
	src/knot/zone/zone-create.c
	src/libknot/rrset.c
	tests-extra/tests/ddns/basic/test.py

Note: ddns/basic fails now, but I don't think it's caused by my merge
jutsu.
parents c3535865 cca75f15
Branches
Tags v1.6.2
Showing
with 191 additions and 199 deletions
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