Commit a4b43a07 authored by Theo Steininger's avatar Theo Steininger
Browse files

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
parents 9c429547 e96eb0fb
Pipeline #9673 passed with stages
in 54 minutes and 25 seconds