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

Merge branch 'master' into 'dpie' 

# Conflicts:
#   pytential/solve.py
parents 0fbff2e4 978306c7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment