Skip to content
Snippets Groups Projects
Commit 37ffae83 authored by jfriedli's avatar jfriedli
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !364
parents 5933d795 f3b6f19f
No related branches found
Tags
1 merge request!364Develop
Showing
with 29 additions and 13 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment