6f568a Merge branch 'cboltz-static' into 'production'

Merged and Committed by Christian Boltz 2 years ago
    Merge branch 'cboltz-static' into 'production'
    
    static_master: update for removed hosts/www.o.o gitmodule
    
    See merge request infra/salt!559