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

Merge branch 'master' into public-libs 

Conflicts:
	src/common/namedb/namedb.h
	src/common/namedb/namedb_trie.c
	src/libknot/descriptor.c
	src/libknot/packet/rrset-wire.c
	src/libknot/processing/requestor.c
	src/libknot/rrtype/aaaa.h
parents f31e8ad8 d37f5825
No related branches found
No related tags found
2 merge requests!330Knsupdate pubkey processing fix,!300Libknot: prefixes + visibility
Hide whitespace changes
Inline Side-by-side
Showing
with 189 additions and 74 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