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

Merge branch 'master' into test_PowerSpace

# Conflicts:
#	nifty/spaces/power_space/power_space.py
parents a8914c33 3860e6da
Pipeline #12356 failed with stage
in 6 minutes and 1 second