zomars 64fc828744 Merge branch 'main' into feat/calcom-auth ... # Conflicts: # .gitmodules # apps/console # apps/web/pages/settings/my-account/conferencing.tsx # apps/website # yarn.lock		2023-01-20 16:10:02 -07:00
..
app-store	Merge branch 'main' into feat/calcom-auth	2023-01-20 16:10:02 -07:00
app-store-cli	path.join causing issues on windows so we keep path like the other exports (#6568)	2023-01-19 13:21:51 +00:00
config	WIP	2023-01-17 15:09:36 -07:00
core	Feature/fixed hosts (#6423)	2023-01-12 14:09:12 -07:00
dayjs	Calendar Weekly Scheduler (#5653)	2022-12-14 13:36:10 +00:00
emails	[CAL-760] Emails: Design Tokens are not update to 2.0 (#6530)	2023-01-17 22:14:16 +01:00
embeds	Formatting	2023-01-04 13:49:20 -07:00
eslint-plugin	Update all Yarn dependencies (2022-08-17) (#3887)	2022-08-29 17:55:27 -06:00
features	Merge branch 'main' into feat/calcom-auth	2023-01-20 16:10:02 -07:00
lib	Merge branch 'main' into feat/calcom-auth	2023-01-20 16:10:02 -07:00
prisma	Merge branch 'main' into feat/calcom-auth	2023-01-20 16:10:02 -07:00
trpc	Merge branch 'main' into feat/calcom-auth	2023-01-20 16:10:02 -07:00
tsconfig	We're not ready for this yet	2022-11-22 20:02:40 -07:00
types	App Store Templates (#5289)	2023-01-18 15:30:25 -07:00
ui	Merge branch 'main' into feat/calcom-auth	2023-01-20 16:10:02 -07:00