Merge branch 'development' into 'v3'

# Conflicts: # .gitignore # hardening_manifest.yaml # scripts/importArtifacts.sh

Merge branch 'development' into 'v3'
# Conflicts: # .gitignore # hardening_manifest.yaml # scripts/importArtifacts.sh
e6a5b8c7 · alexander.klepal · 5544b696 · 031b7bb2 · e6a5b8c7
Commit e6a5b8c7 authored Jun 11, 2021 by alexander.klepal
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

.dockerignore .dockerignore +3 -0

No files found.
--- a/.dockerignore
+++ b/.dockerignore
+scripts/build-image.sh
+scripts/genManifestTemplate.sh
+scripts/importArtifacts.sh
\ No newline at end of file