Commit 60385ce8 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Merge branch 'master' into dev

Conflicts:
	tests/test_COREG.py
parents d6c8e5bb c7fda6b8
Pipeline #2914 passed with stages
in 9 minutes and 51 seconds