Commit 1d4765c6 authored by Matthieu Boileau's avatar Matthieu Boileau
Browse files

Merge branch 'dev-calendar' into 'master'

ical: added colloquium to merged events

See merge request !14
parents 243e134f 4bcd8835
Pipeline #19457 passed with stages
in 17 seconds