Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy
# Conflicts: # nifty/operators/probing_operator/__init__.py # nifty/operators/probing_operator/diagonal_prober.py # nifty/operators/probing_operator/trace_prober.py
Please register or sign in to comment