d363ad Merge branch 'cboltz-forums-mysql' into production

Merged and Committed by Christian Boltz 4 years ago
    Merge branch 'cboltz-forums-mysql' into production
    
    See merge request infra/salt!356
    
    (manually merged on the commandline because the CI is currently broken)