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

Merge branch 'post-release' into development 

Conflicts:
	libknot/nameserver/name-server.c
	libknot/zone/node.c
	libknot/zone/zone.c
	src/common/slab/slab.c
	src/knot/server/zones.c
	src/knot/zone/zone-dump.c
	src/zcompile/zcompile.c
parents 1b5250c1 52abd9c7
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 136 additions and 686 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