Commit c1ed58d7 authored by Gandalf's avatar Gandalf
Browse files

Merge branch 'develop' into 'master' 

Develop to master (fixes 3speak regression)

See merge request !411
parents 5e754202 427458bb
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