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

Merge branch 'modules' into development

Conflicts:
	Knot.files
	src/Makefile.am
	src/common/lists.c
	src/dnslib/zone-dump.c
	src/knot/conf/conf.c
	src/knot/conf/logconf.c
	src/knot/main.c

Note: evqueue moved to knot/other/
parents e3b32125 218292d2
No related branches found
No related tags found
No related merge requests found
Showing with 198 additions and 161 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment