Skip to content
Commit ee8f234d authored by Xiaoyu Wei's avatar Xiaoyu Wei
Browse files

Merge branch 'master' into 'master' 

# Conflicts:
#   modepy/quadrature/jacobi_gauss.py
parents cca1ace3 1f9374a0
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