Merge branch '5.x' of https://github.com/craftcms/feed-me into 6.x

# Conflicts: # composer.json # composer.lock # src/web/assets/feedme/dist/FeedMe.js.map
craftcms · Mar 16, 2024 · 9613f85 · 9613f85
2 parents c83b0e4 + 6a3b575
commit 9613f85
Show file tree

Hide file tree

Showing 12 changed files with 409 additions and 407 deletions.
diff --git a/.ddev/providers/platform.yaml b/.ddev/providers/platform.yaml
diff --git a/.ddev/xhprof/xhprof_prepend.php b/.ddev/xhprof/xhprof_prepend.php
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,5 @@ tests/.env
 /.sass-cache
 /tests/_craft/.env
 /src/web/assets/feedme/.env
+/.ddev/xhprof/xhprof_prepend.php
+/.ddev/providers/platform.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release Notes for Feed Me
 
+## 5.4.0 - 2024-02-25
+
+- Feed Me now requires Craft 4.6 or later.
+- Added support for importing into the native [Country](https://craftcms.com/docs/4.x/country-fields.html) field. ([#1410](https://github.com/craftcms/feed-me/pull/1410))
+- Fixed a bug where the Entry Type wouldn’t be remembered for related Entry fields in a feed’s mappings. ([#1387](https://github.com/craftcms/feed-me/issues/1387), [#1390](https://github.com/craftcms/feed-me/pull/1390))
+
 ## 5.3.0 - 2023-11-27
 
 - Added the ability to provide a filename for importing assets via the assets field if you choose to “Create asset from URL”. ([#749](https://github.com/craftcms/feed-me/issues/749))