9cb98b Merge branch 'cboltz-wiki-common' into 'production'

Merged and Committed by Theo Chatzimichos 6 years ago
    Merge branch 'cboltz-wiki-common' into 'production'
    
    Move common pillar data to common/wiki
    
    See merge request !55
        
file modified
+3 -13
file modified
+3 -15