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

Merge branch 'development' into 'master' 

Development

See merge request !1574
parents 979fa28d e86bd4ea
No related branches found
No related tags found
3 merge requests!1645Development,!1641Development,!1574Development
Hide whitespace changes
Inline Side-by-side
Showing
with 62 additions and 30 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