Merge branch 'feature/show-holidays-in-timetable' into 'master'

Show holidays in timetable

See merge request !355

aleksis/apps/chronos/frontend/components/Timetable.vue

@@ -11,7 +11,11 @@ export default {
   <timetable-wrapper>
     <template #default="{ selected }">
       <calendar-with-controls
-        :calendar-feeds="[{ name: 'lesson' }, { name: 'supervision' }]"
+        :calendar-feeds="[
+          { name: 'lesson' },
+          { name: 'supervision' },
+          { name: 'holidays' },
+        ]"
         :params="{ type: selected.type, id: selected.objId }"
       />
     </template>