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

Merge branch 'master' into 'clenshaw-curtis' 

# Conflicts:
#   modepy/quadrature/jacobi_gauss.py
parents 39d7a1df e2f915b6
Pipeline #19068 passed with stage
in 54 seconds