Merge branch 'master' into resolver_compat
Conflicts: Knot.files src/Makefile.am src/knot/conf/conf.h src/knot/nameserver/process_answer.c src/knot/zone/events/handlers.c
Showing
m4/knot-check-header.m4
0 → 100644
src/common/namedb/namedb.h
0 → 100644