Commit Graph

3 Commits (33cca1c574084623c13dba845518876e31a766fd)

Author SHA1 Message Date
KATT fbc5ac4c14 Merge remote-tracking branch 'origin/main' into katt/cal-620-edge-fns
# Conflicts:
#	components/booking/DatePicker.tsx
#	pages/[locale]/[user].tsx
#	pages/[user]/[type].tsx
2021-11-19 11:37:56 +01:00
KATT fe1f4627be fix bad merge 2021-11-15 10:23:12 +01:00
KATT 87cd589112 edge functions init 2021-10-27 01:16:31 +02:00