569f65 Merge branch 'cboltz-fix-include-optional' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'cboltz-fix-include-optional' into 'production'
    
    fix include_optional() for salt/
    
    See merge request infra/salt!92
        
file modified
+3 -3