Skip to content
Snippets Groups Projects
Commit 907b53c6 authored by Marek Vavrusa's avatar Marek Vavrusa
Browse files

Merge branch 'master' into release1.2 

Conflicts:
	samples/knot.full.conf
	src/knot.conf.5
	src/knot/conf/conf.h
	src/knot/server/zones.c
	src/knot/server/zones.h
	src/knotc.8
parents 1c5e7f93 8c2d0640
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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