c17a28 Merge branch 'estu/new-progress' into 'production'

Merged and Committed by Christian Boltz 4 years ago
    Merge branch 'estu/new-progress' into 'production'
    
    [Estu] - update upstream for progress
    
    See merge request infra/salt!385
        
file modified
+10 -7