• Marek Vavruša's avatar
    Merge branch 'master' into resolver_compat · b6347be9
    Marek Vavruša authored
    Conflicts:
    	Knot.files
    	src/knot/nameserver/update.c
    	src/knot/nameserver/update.h
    	src/knot/server/tcp-handler.c
    	src/knot/zone/events.c
    	src/knot/zone/zone.c
    	src/knot/zone/zone.h
    	src/libknot/packet/net.c
    	src/libknot/rdataset.c
    	src/utils/nsupdate/nsupdate_params.h
    b6347be9
contents.c 37.5 KB