Skip to content
Snippets Groups Projects
Commit 1b854224 authored by Malte Bauch's avatar Malte Bauch
Browse files

Merge branch 'master-into-develop2' into 'develop' 

Master into develop2

See merge request !243
parents c638233d 2de82095
No related branches found
No related tags found
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 6 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment