Skip to content
GitLab
Explore
Sign in
ift
NIFTy
Repository
nifty
docs
source
index.rst
Find file
Blame
History
Permalink
Merge branch 'master' into 'sphinx_docs'
· 3681524e
Theo Steininger
authored
May 27, 2017
# Conflicts: # docs/source/conf.py # docs/source/field.rst # docs/source/index.rst
3681524e