Merge remote-tracking branch 'origin/10.2' into 11.x

# Conflicts: # config/pimcore/customviews.example.php # config/pimcore/customviews.php # dump/data-1-settings_store.sql
pimcore · Jan 4, 2023 · 78fad8b · 78fad8b
2 parents 2f777ed + b53a29a
commit 78fad8b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 925 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ You don't need to have a PHP environment with composer installed.
     `cd my-project/`
 1. Part of the new project is a docker compose file
     * Run `` echo `id -u`:`id -g` `` to retrieve your local user and group id
-    * Open the `docker-compose.yml` file in an editor, uncomment all the `user: '1000:1000'` lines and update the ids if necessary
+    * Open the `docker-compose.yaml` file in an editor, uncomment all the `user: '1000:1000'` lines and update the ids if necessary
     * Start the needed services with `docker-compose up -d`
 1. Install pimcore and initialize the DB
     `docker-compose exec php vendor/bin/pimcore-install --mysql-host-socket=db --mysql-username=pimcore --mysql-password=pimcore --mysql-database=pimcore`

diff --git a/config/pimcore/customviews.example.php b/config/pimcore/customviews.example.php
diff --git a/config/pimcore/customviews.php b/config/pimcore/customviews.php