Merge branch 'master' into 'sphinx_docs'
# Conflicts: # docs/source/conf.py # docs/source/field.rst # docs/source/index.rst
docs/Makefile
0 → 100644
docs/source/fft_operator.rst
0 → 100644
docs/source/gl_space.rst
0 → 100644
docs/source/hp_space.rst
0 → 100644
Please register or sign in to comment