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

There are no changes