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

Merge branch 'development' into 'master' 

Development

See merge request !982
parents 75c6f181 310fd41a
No related branches found
No related tags found
3 merge requests!1061Development,!1046Patch,!982Development
Hide whitespace changes
Inline Side-by-side
Showing
with 182 additions and 145 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