Merge branch 'main' into feat/api-keys

pull/2277/head
kodiakhq[bot] 2022-04-13 14:55:13 +00:00 committed by GitHub
commit 7fbc5ed4d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -674,7 +674,7 @@ const EventTypePage = (props: inferSSRProps<typeof getServerSideProps>) => {
fillRule="evenodd"></path>
</g>
</svg>
<span className="text-sm ltr:ml-2 rtl:mr-2">Daily.co Video</span>
<span className="text-sm ltr:ml-2 rtl:mr-2">Cal.com Video</span>
</div>
)}
{location.type === LocationType.Zoom && (

View File

@ -587,7 +587,7 @@
"cal_provide_google_meet_location": "Cal will provide a Google Meet location.",
"cal_provide_zoom_meeting_url": "Cal will provide a Zoom meeting URL.",
"cal_provide_tandem_meeting_url": "Cal will provide a Tandem meeting URL.",
"cal_provide_video_meeting_url": "Cal will provide a Daily video meeting URL.",
"cal_provide_video_meeting_url": "Cal will provide a video meeting URL.",
"cal_provide_jitsi_meeting_url": "We will generate a Jitsi Meet URL for you.",
"cal_provide_huddle01_meeting_url": "Cal will provide a Huddle01 web3 video meeting URL.",
"cal_provide_teams_meeting_url": "Cal will provide a MS Teams meeting URL. NOTE: MUST HAVE A WORK OR SCHOOL ACCOUNT",