Malte Delfs 543482ca52 Merge branch 'main' into feature/custom-fields-on-the-booking-page ...

# Conflicts:
#	pages/api/availability/eventtype.ts
#	pages/availability/event/[type].tsx

2021-06-19 20:47:31 +02:00

..

migrations

Merge branch 'main' into feature/custom-fields-on-the-booking-page

2021-06-19 20:47:31 +02:00

schema.prisma

Merge branch 'main' into feature/add-buffer-times-for-appointments

2021-06-18 17:04:05 +01:00