9f279d Merge branch 'cboltz-wiki-adjustments' into 'production'

Merged and Committed by Christian Boltz 6 years ago
    Merge branch 'cboltz-wiki-adjustments' into 'production'
    
    Wiki config: adjust $wgSquidServers to the NBG setup
    
    See merge request infra/salt!134