Skip to content
Commit 4fa04cf5 authored by Matt Wala's avatar Matt Wala
Browse files

Merge branch 'master' into unregularized-fmm 

Conflicts:
	pytential/qbx/__init__.py
parents 0ca64a27 697eaff3
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