nicolas 3c09837104 Resolved conflicts		2021-07-07 12:43:13 +02:00
..
[user]	Resolved conflicts	2021-07-07 12:43:13 +02:00
api	Resolved conflicts	2021-07-07 12:43:13 +02:00
auth	fix: add login link on forgot password page	2021-06-29 11:45:54 +03:00
availability	Resolved conflicts	2021-07-07 12:43:13 +02:00
bookings	Resolved conflicts	2021-07-07 12:43:13 +02:00
cancel	Revert "Revert "Fixed cancellation bug: "cannot read property 'length' of null"""	2021-06-21 07:31:39 -05:00
integrations	Merge branch 'main' into feature/zoom-integration	2021-06-20 16:37:51 +02:00
reschedule	UI for rescheduling	2021-06-09 20:28:39 +02:00
settings	Resolved conflicts	2021-07-07 12:43:13 +02:00
[user].tsx	Merge branch 'main' into bugfix/lowercase-usernames	2021-06-23 11:29:56 +01:00
_app.tsx	Resolved conflicts	2021-07-07 12:43:13 +02:00
index.tsx	Add some extra states	2021-06-22 15:05:15 +01:00
success.tsx	Hide Calendso branding	2021-06-29 17:08:55 +01:00