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

Merge branch 'master' into h-2d 

Conflicts:
	sumpy/expansion/__init__.py
parents 83388ffb 67d606d9
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