Commit dd335839 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'issue/update_changes_from_feature_branch' into 'develop'

some changes from feature/block_matrix adopted

See merge request !19
parents 5a687fad 481178b5
Pipeline #1083 failed with stage
in 2 minutes and 32 seconds