Skip to content
Snippets Groups Projects
Commit 87ae0d84 authored by Lubos Slovak's avatar Lubos Slovak
Browse files

Merge branch 'master' into ext-rcode

Conflicts:
	src/knot/nameserver/process_query.c
parents 5e302090 c6874dc3
2 merge requests!330Knsupdate pubkey processing fix,!299Fixed (Extended) RCODE handling
Showing with 290 additions and 257 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