8694d1 Merge branch 'meet.o.o' into 'production'

Merged and Committed by Christian Boltz 4 years ago
    Merge branch 'meet.o.o' into 'production'
    
    add meet.o.o to salt
    
    See merge request infra/salt!377