Malte Delfs 88ab985ac4 Merge branch 'main' into feature/refresh-tokens-and-error-handling ... # Conflicts: # lib/calendarClient.ts # pages/[user]/[type].tsx # pages/[user]/book.tsx # pages/api/book/[user].ts		2021-06-21 17:56:14 +02:00
..
team	Minor UI changes to teams	2021-06-08 17:00:06 +01:00
ui	error handling WIP	2021-06-20 21:02:15 +02:00
ActiveLink.tsx	Merge branch 'main' into feature/zoom-integration	2021-06-20 16:37:51 +02:00
Avatar.tsx	fix: Use proper url parameter for profile img placeholder	2021-06-17 16:47:49 +02:00
DonateBanner.tsx	Update donation banner	2021-05-13 15:44:48 +01:00
Modal.tsx	Fix a bunch of TypeScript errors	2021-04-29 14:47:01 +01:00
Settings.tsx	Merge branch 'main' into feature/zoom-integration	2021-06-20 16:37:51 +02:00
Shell.tsx	Added button to add integrations	2021-06-10 22:54:48 +02:00