fdd086 Merge branch 'cboltz-drop-12_or_42' into 'production'

Merged and Committed by lrupp 4 years ago
    Merge branch 'cboltz-drop-12_or_42' into 'production'
    
    Get rid of 12_or_42.sls
    
    See merge request infra/salt!293
        
file modified
+9 -0
file modified
+0 -1
file modified
+0 -3