Skip to content
  • Theo Steininger's avatar
    Merge branch 'master' into mmm5 · 45b8dde7
    Theo Steininger authored
    # Conflicts:
    #	nifty/operators/fft_operator/transformations/gllmtransformation.py
    #	nifty/operators/fft_operator/transformations/lmgltransformation.py
    45b8dde7