Commit 415485fd authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Merge branch 'master' into feature/implement_operators

# Conflicts:
#	geoarray/baseclasses.py
parents 8829a837 bf03bd02
Pipeline #19577 failed with stage
in 1 minute and 34 seconds