mpeltriaux c0595760ab Merge branch 'master' into 138_New_map_client ... # Conflicts: # konova/models/geometry.py # konova/urls.py # locale/de/LC_MESSAGES/django.mo # locale/de/LC_MESSAGES/django.po		2022-05-25 09:22:15 +02:00
..
ema	Merge branch 'master' into 138_New_map_client	2022-05-25 09:22:15 +02:00