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

Merge branch 'development' into 'master' 

Development

See merge request !1464
parents bf357365 7d17acc1
No related branches found
No related tags found
2 merge requests!1504Master,!1464Development
Hide whitespace changes
Inline Side-by-side
Showing
with 188 additions and 59 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