e045dc
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