Commit 98e6c036 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

Merge branch 'windows_nifty' into 'NIFTy_7'

Windows nifty

See merge request !655
parents 9f21053e bd809493
Pipeline #105181 passed with stages
in 33 minutes and 11 seconds