Skip to content
Snippets Groups Projects
Commit 0d87f1d9 authored by Eugine Blikh's avatar Eugine Blikh
Browse files

Merge branch 'stable'

Conflicts:
	client/tarancheck/tc_config.c
	client/tarancheck/tc_generate.c
	debian/control
parents 0e476496 eaef3c9a
No related branches found
No related tags found
No related merge requests found
Showing
No files found.
with 0 additions and 0 deletions
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