Skip to content
Commit 31de44ed authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'master' into 'numpy-1-14-compat' 

# Conflicts:
#   .gitlab-ci.yml
parents b90716b8 0a251b88