e045dc Merge branch 'events_moved' into 'production'

Merged and Committed by Theo Chatzimichos 5 years ago
    Merge branch 'events_moved' into 'production'
    
    remove conference.i.o.o, events.o.o moved to dale.i.o.o
    
    See merge request infra/salt!225