d0c14d Merge branch 'tampakrap_bryce' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'tampakrap_bryce' into 'production'
    
    Improvements in pillar/top.sls
    
    See merge request infra/salt!81
        
file modified
+2 -2