Skip to content
Snippets Groups Projects
Commit fa34ab3b authored by Marek Vavrusa's avatar Marek Vavrusa
Browse files

Merge branch 'branch-1.4prep' into dname_refactor

Conflicts:
	src/libknot/updates/ddns.c
parents 4e5f919c 21d952ff
No related branches found
No related tags found
No related merge requests found
Showing with 229 additions and 266 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