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

Merge branch 'master' into 'rscale' 

# Conflicts:
#   sumpy/version.py
parents a33ee5ee 0f12a88d
Pipeline #10187 failed with stage
in 31 minutes and 5 seconds