Skip to content
Snippets Groups Projects
Commit 7c3aad90 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'development' into 'master' 

Development



See merge request !132
parents 596bdf1b 1349d054
No related branches found
No related tags found
2 merge requests!135Hotfix,!132Development
Hide whitespace changes
Inline Side-by-side
Showing
with 90 additions and 8 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