Commit 83ba1169 authored by sloosvel's avatar sloosvel
Browse files

Merge branch 'master' into 'dev_user_interface'

# Conflicts:
#   diagonals/examples/examples-moc.py
#   diagonals/examples/examples-regionmean.py
parents 5ed4ca87 fa7a70b0
Pipeline #1488 passed with stages
in 3 minutes and 20 seconds