Skip to content
Commit 0ad86d54 authored by Matt Wala's avatar Matt Wala
Browse files

Merge branch 'master' into symengine-2 

Conflicts:
	sumpy/kernel.py
parents 623e1fd1 7dacd243
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