Skip to content
Commit 2d4cccf8 authored by Radoslav Mráz's avatar Radoslav Mráz
Browse files

Merge branch 'develop' into migration_to_pint

# Conflicts:
#	maphis/common/label_image.py
#	maphis/common/scale_setting_widget.py
#	maphis/plugins/maphis/general/common.py
#	maphis/plugins/maphis/properties/area.py
#	maphis/plugins/maphis/properties/circularity.py
#	maphis/plugins/maphis/properties/geodesic_length.py
#	maphis/plugins/maphis/properties/geodesic_length_cpp.py
#	maphis/plugins/maphis/properties/glcm.py
#	maphis/plugins/maphis/properties/max_feret.py
#	maphis/plugins/maphis/properties/mean_width.py
#	maphis/plugins/maphis/properties/mean_width_cpp.py
#	maphis/plugins/maphis/properties/oriented_bbox_dimensions.py
#	maphis/plugins/profile_register/general/profile_registering.py
parents e5051cf9 ccc734a0
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment