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

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

Master into develop2 into master

See merge request !244
parents db2d6379 c5f06abd
No related branches found
No related tags found
No related merge requests found
Pipeline #96694 passed with warnings
Showing
with 476 additions and 48 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment