b3af6e Merge branch 'cboltz-wiki-vms' into 'production'

Merged and Committed by Theo Chatzimichos 7 years ago
    Merge branch 'cboltz-wiki-vms' into 'production'
    
    add pillar/id/riesling and pillar/id/water (wiki and wikisearch)
    
    See merge request !20