Commit 46f2d697 authored by Philipp Arras's avatar Philipp Arras
Browse files

Merge branch 'nifty6tonifty7' into 'NIFTy_7'

Nifty6tonifty7

See merge request !526
parents 1299dd5e e47bd9ed
Pipeline #76111 passed with stages
in 13 minutes and 42 seconds