c1a441 Merge branch 'tampakrap_new_salt_location' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'tampakrap_new_salt_location' into 'production'
    
    new location for the salt user on salt-2017.7.x
    
    See merge request !42
        
file modified
+4 -4