merge-upstream-5.0.1 #66

Merged
778a69cd merged 80 commits from merge-upstream-5.0.1 into main 2024-12-26 12:55:41 +01:00
Showing only changes of commit 29c9ded5b7 - Show all commits

View file

@ -117,7 +117,7 @@ const showLocalTimezone = ref(true);
const timezoneToShow = computed((): string | undefined => {
if (showLocalTimezone.value) {
return props.timezone;
return props.timezone ?? userActualTimezone.value;
}
return userActualTimezone.value;
});