Commit c876e993 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

Merge branch 'NIFTy_6' into 'new_random'

# Conflicts:
#   nifty6/__init__.py
parents 71349a7e 604044cd
Pipeline #71262 canceled with stages
in 1 minute and 41 seconds