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
Pipeline #18986 failed with stage
in 48 seconds