Skip to content
Snippets Groups Projects
Commit 1dceddf5 authored by Lukáš Krupčík's avatar Lukáš Krupčík
Browse files

Merge branch 'master' into 'add_soft'

Master

See merge request !170
parents af002993 461f7d2a
No related branches found
No related tags found
1 merge request!170Master
Showing
with 163 additions and 54 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