Skip to content

Commit 8279866

Browse files
committed
Merge branch '5.x' into 6.x
2 parents 64e25fd + 1122b88 commit 8279866

File tree

7 files changed

+10082
-15978
lines changed

7 files changed

+10082
-15978
lines changed

.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ tests/.env
1111
/node_modules/*
1212
/build/*
1313
/yarn-error.log
14-
/docs/.vitepress/dist
15-
/docs/.vitepress/cache
1614

1715
# MISC FILES
1816
.cache

docs/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
node_modules
2+
.vitepress/dist
3+
.vitepress/cache

docs/get-started/configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Configuration
22

3-
Create an `feed-me.php` file under your `/config` directory with the following options available to you. You can also use multi-environment options to change these per environment.
3+
Create a `feed-me.php` file under your `/config` directory with any of the following. Feed Me’s configuration file allows customization [per-environment](https://craftcms.com/docs/4.x/config/#multi-environment-configs) and [per-feed](#configuration-options) (see `feedOptions`).
44

55
```php
66
<?php

0 commit comments

Comments
 (0)