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

Merge branch 'development' into 'master' 

Development



See merge request !265
parents 4de14285 007ac73c
No related branches found
No related tags found
2 merge requests!267Bugfix,!265Development
Hide whitespace changes
Inline Side-by-side
Showing
with 151 additions and 20 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