Skip to content
Snippets Groups Projects
Commit 4b3f1e0d authored by Sandra Westerhoff's avatar Sandra Westerhoff
Browse files

Merge branch 'dev' into 'main' 

merge dev into main

See merge request !370
parents d1e6680f 36a5217e
Branches
Tags
1 merge request!370merge dev into main
Pipeline #1337013 passed with warnings
Stage: build
Stage: test
Stage: publish
Stage: code-analysis
Hide whitespace changes
Inline Side-by-side
Showing
with 64 additions and 238 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment