Commit 4f4b52f2 authored by Gandalf's avatar Gandalf
Browse files

Merge branch 'g-maintenance' into 'develop' 

simple fixes

See merge request !408
parents 9519676d 2d17ab12
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment