Commit ecdab135 authored by Radoslav Mráz's avatar Radoslav Mráz
Browse files

Merge branch 'main' into visual_cues 

# Conflicts:
#	maphis/common/param_widget.py
#	maphis/label_editor/computation_widget.py
#	maphis/layers/visualization_layer.py
parents 440972c7 2f7044df
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment