Skip to content
Commit a477a6fa authored by Mila Anastasova's avatar Mila Anastasova
Browse files

Merge branch 'kats_v1.2.x' into 'kats_v1.2.x' 

# Conflicts:
#   main.c
parents 0e0f3acf 41caf04e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment