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

Merge branch 'development' into 'master' 

Development

See merge request !1468
parents 6e0c88b2 efcde1f2
No related branches found
No related tags found
2 merge requests!1504Master,!1468Development
Hide whitespace changes
Inline Side-by-side
Showing
with 189 additions and 23 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