646893 Merge branch 'nginx_progress' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'nginx_progress' into 'production'
    
    add progress.o.o nginx config
    
    See merge request infra/salt!162