4f4493 Merge branch 'cboltz-pmya' into 'production'

Merged and Committed by Christian Boltz 2 years ago
    Merge branch 'cboltz-pmya' into 'production'
    
    phpMyAdmin moved to /usr/ in 15.4, update apache config
    
    See merge request infra/salt!563