nicolas 3c09837104 Resolved conflicts		2021-07-07 12:43:13 +02:00
..
[user].ts	Fix issue where user ID is not fetched	2021-07-06 22:09:53 +01: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	Final thing to check is timezones, currently if I am in Kuala Lumpur the time is correct, but it jumps 8 hours due to being out of bound on Seoul.	2021-06-29 01:45:58 +00:00
week.ts	Resolved conflicts	2021-07-07 12:43:13 +02:00