Alex van Andel 8bc209f6d0 Attempts to fix conflict with zoom		2021-08-04 21:04:23 +00:00
..
[user].ts	Attempts to fix conflict with zoom	2021-08-04 21:04:23 +00:00
calendar.ts	Merge branch 'main' into feature/zoom-integration	2021-06-20 16:37:51 +02:00
day.ts	Merge branch 'main' into feature/zoom-integration	2021-06-20 16:37:51 +02:00
eventtype.ts	Added accompanying frontend	2021-07-23 20:19:23 +00:00
week.ts	Resolved conflicts	2021-07-07 12:43:13 +02:00