Commit fac03fd8 authored by Jakob Maljaars's avatar Jakob Maljaars

Merge branch 'idg-cal-jakob-1' into 'master'

Idg cal jakob 1 (rebased)

See merge request !51
parents ea8e5c44 009945f9
Pipeline #8125 passed with stages
in 56 minutes and 31 seconds