cb984f Merge branch 'cboltz-elasticsearch-repo' into 'production'

Merged and Committed by Christian Boltz 6 years ago
    Merge branch 'cboltz-elasticsearch-repo' into 'production'
    
    Adjust wikisearch role for the winning pull request
    
    See merge request infra/salt!111
        
file modified
+1 -4
file modified
+1 -1