Commit 95896eb8 authored by Maximilian Schanner's avatar Maximilian Schanner
Browse files

Merge branch 'master' into 'geodetic'

# Conflicts:
#   pymagglobal/__init__.py
parents 1ae816fb a2153a5a