Commit 102c1aad authored by Theo Steininger's avatar Theo Steininger

Merge branch 'master' into fftw_for_the_masses

# Conflicts:
#	test/test_spaces/test_power_space.py
parents 693d7194 05d1d092
Pipeline #13333 failed with stage
in 5 minutes and 19 seconds