Merge remote-tracking branch 'origin/craft-4' into craft-5

# Conflicts: # CHANGELOG.md # composer.json
verbb · Apr 12, 2024 · 4d6bfd3 · 4d6bfd3
2 parents dc423fb + d59b60c
commit 4d6bfd3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@
 - Now requires PHP `8.2.0+`.
 - Now requires Craft `5.0.0-beta.1+`.
 
+## 4.0.10 - 2024-03-26
+
+### Fixed
+- Fix an error in Craft 4.6.0 where dropdown column options weren’t saving correctly.
+
 ## 4.0.9 - 2024-03-04
 
 ### Fixed

diff --git a/src/resources/dist/js/tablemaker.js b/src/resources/dist/js/tablemaker.js