Skip to content
Snippets Groups Projects
Commit 827b1bd0 authored by Jentsch, Helge's avatar Jentsch, Helge
Browse files

Merge branch 'master' into 'NewBranch' 

# Conflicts:
#   DESCRIPTION
parents 358f35ee cc2d846c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 15 additions and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment