Skip to content
Snippets Groups Projects
Commit 6b620eea authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main' 

Merging develop into main

See merge request !34
parents 9ead38c5 aa1a8650
No related branches found
No related tags found
1 merge request!34Merging develop into main
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment