Skip to content
Commit 81d1159d authored by Patrik Mažári's avatar Patrik Mažári
Browse files

Merge branch 'merge-two' into 'master' 

Merging changes from 2 locations into master

See merge request xfurman/biomedvisplatform!16
parents c6f96748 078907d3
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment