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

Merge branch 'master' into 'master' 

allow active / inactive for caa :)



See merge request !600
parents ce808767 6429d929
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