Skip to content
Commit dfe337e0 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'master' into 'stable-3.1' 

fixed bastille-detection during install



See merge request !298
parents 21ef2a6c 567aeab1
Hide whitespace changes
Inline Side-by-side
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