# Conflicts:
#	alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProzessor.java
#	alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/command/VorgangWithEingangCommandProzessor.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangProzessorTest.java
#	alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/command/VorgangWithEingangCommandProzessorTest.java

Merge pull request 'OZG-3934-Fix-Cypress-Screenshots' (#318) from OZG-3934-Fix-Cypress-Screenshots into master

Reviewed-on: https://git.ozg-sh.de/mgm/goofy/pulls/318


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

Also:
- Add run-test.sh which executes Report commands in a much more readable way
- No more "npm run" commands
- Shell commands instead of NodeJS wrapping for basic file system tasks

Merge pull request 'optional-ingress-class-name' (#317) from optional-ingress-class-name into master

Reviewed-on: https://git.ozg-sh.de/mgm/goofy/pulls/317


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

Client DevTalk result

Merge pull request 'OZG-4391 OZG-4462 add helm chart support for smart documents config' (#316) from OZG-4391-add-helm-chart-values into master

Reviewed-on: https://git.ozg-sh.de/mgm/goofy/pulls/316

Reviewed-on: https://git.ozg-sh.de/mgm/goofy/pulls/315

Merge pull request 'OZG-4391-smart-document-service-kiel' (#314) from OZG-4391-smart-document-service-kiel into master

Reviewed-on: https://git.ozg-sh.de/mgm/goofy/pulls/314


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

Merge pull request 'OZG-4078-check-xdomea-files' (#311) from OZG-4078-check-xdomea-files into master

Reviewed-on: https://git.ozg-sh.de/mgm/goofy/pulls/311


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

Reviewed-on: https://git.ozg-sh.de/mgm/goofy/pulls/299


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>