Merge remote-tracking branch 'origin/master' into feature/cc-9483/dev…

…-email-in-spryker
spryker · Jul 2, 2020 · aab7757 · aab7757
2 parents c7a445b + c62ae6f
commit aab7757
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -24,6 +24,7 @@ codeception.yml export-ignore
 dependency.json export-ignore
 phpstan.json export-ignore
 phpstan.neon export-ignore
+psalm-report.json export-ignore linguist-generated=true
 tooling.yml export-ignore
 .coveralls.yml export-ignore
 .travis.yml export-ignore

diff --git a/psalm-report.json b/psalm-report.json