Self sign-up has been disabled due to increased spam activity. If you want to get access, please send an email to a project owner (preferred) or at gitlab(at)nic(dot)cz. We apologize for the inconvenience.

Commit 5b122cf3 authored 11 years ago by Jan Kadlec

Merge branch 'branch-1.4prep' into dsfix.

There were many conflicts, needs a test.

Conflicts:
	src/libknot/updates/xfr-in.c
	src/zscanner/scanner.c

parents b85bc948 eea34622

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 234 additions and 420 deletions

Please register or to comment

Admin message

Merge branch 'branch-1.4prep' into dsfix.