Merge branch '4.11' into 4

2022-06-14 11:33:28 +12:00 · 2022-06-14 11:33:28 +12:00 · 4eea3f390a
parent 3a5f852d31 45921d29de
commit 4eea3f390a
4 changed files with 4 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,4 +4,5 @@
 /themes/simple/
 /_resources/
 /public/_resources/
-/.graphql-generated
+/.graphql-generated/
+/public/_graphql/
--- a/.graphql-generated/_manifest_exclude
+++ b/.graphql-generated/_manifest_exclude
--- a/composer.json
+++ b/composer.json
@ -15,7 +15,8 @@
    "extra": {
        "project-files": [
            "app/_config/*",
-            ".env.example"
+            ".env.example",
+            ".graphql-generated/*"
        ],
        "public-files": [
            "assets/*",
--- a/public/_graphql/.gitkeep
+++ b/public/_graphql/.gitkeep