Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Knot projects
Knot DNS
Repository
knot-dns
Knot.files
Find file
Blame
History
Permalink
Merge branch 'master' into packet-api-rewrite
· f992cf25
Marek Vavrusa
authored
Jan 28, 2014
Conflicts: src/knot/server/zones.c src/libknot/nameserver/name-server.c
f992cf25