Skip to content
Snippets Groups Projects
Commit c53ae10f authored by Jan Kadlec's avatar Jan Kadlec
Browse files

Merge remote-tracking branch 'origin/master' into cleanup_node

Conflicts:
	src/knot/updates/xfr-in.c
	src/knot/zone/estimator.c
	src/knot/zone/node.c
parents ad4c50de 746f72a7
No related branches found
No related tags found
1 merge request!217Node Cleanup
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment