Merge branch 'master' into mmm5
# Conflicts: # nifty/operators/fft_operator/transformations/gllmtransformation.py # nifty/operators/fft_operator/transformations/lmgltransformation.py
ci/install_h5py.sh
0 → 100644
ci/install_pyfftw.sh
0 → 100644