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
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment