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

Merge branch 'development' into 'master' 

Development

See merge request !1379
parents e7bd6f70 172b0fd3
No related branches found
No related tags found
2 merge requests!1504Master,!1379Development
Hide whitespace changes
Inline Side-by-side
Showing
with 125 additions and 105 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