Merge branch 'feature-7.5' of github.com:ionic-team/ionic-framework i…

…nto FW-5129
ionic-team · Oct 3, 2023 · 5816a1f · 5816a1f
2 parents 4608eef + 597bc3f
commit 5816a1f
Show file tree

Hide file tree

Showing 23 changed files with 659 additions and 318 deletions.
diff --git a/core/api.txt b/core/api.txt
@@ -394,7 +394,7 @@ ion-datetime,prop,disabled,boolean,false,false,false
 ion-datetime,prop,doneText,string,'Done',false,false
 ion-datetime,prop,firstDayOfWeek,number,0,false,false
 ion-datetime,prop,highlightedDates,((dateIsoString: string) => DatetimeHighlightStyle | undefined) | DatetimeHighlight[] | undefined,undefined,false,false
-ion-datetime,prop,hourCycle,"h12" | "h23" | undefined,undefined,false,false
+ion-datetime,prop,hourCycle,"h11" | "h12" | "h23" | "h24" | undefined,undefined,false,false
 ion-datetime,prop,hourValues,number | number[] | string | undefined,undefined,false,false
 ion-datetime,prop,isDateEnabled,((dateIsoString: string) => boolean) | undefined,undefined,false,false
 ion-datetime,prop,locale,string,'default',false,false