Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history
* 6.4:
  [Form] Fix merging form data and files (ter)
  [Intl] Update the ICU data to 74.1
  [Scheduler] Use MockClock
  [AssetMapper] Fixing memory bug where we stored way more file content than needed
  [AssetMapper] jsdelivr "no version" import syntax
  [HtmlSanitizer] Consider `width` attribute as safe
  [DoctrineBridge] Fix exception message
  [Security][Validator] Missing translations for Luxembourgish
  • Loading branch information
fabpot committed Oct 28, 2023
2 parents e6ce54f + 8057a62 commit 50ec3a4
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions Resources/data/parents.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"en_GM": "en_001",
"en_GY": "en_001",
"en_HK": "en_001",
"en_ID": "en_001",
"en_IE": "en_001",
"en_IL": "en_001",
"en_IM": "en_001",
Expand Down

0 comments on commit 50ec3a4

Please sign in to comment.