Commit a6e742e4 authored by Gandalf's avatar Gandalf
Browse files

Merge branch 'develop' into 'master' 

merge branch develop into master

See merge request !396
parents 80a8acf0 20e8fee8
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