78cfcb Merge branch 'cboltz-static' into 'production'

Merged and Committed by Christian Boltz 5 years ago
    Merge branch 'cboltz-static' into 'production'
    
    salt static.o.o etc. including updating from git
    
    See merge request infra/salt!222
        
file modified
+5 -0
file modified
+2 -0