Resolved merge conflict

39af0293 · Martin Weise · c8c42353 · c8c42353 · c8c42353 · c8c42353
Verified Commit 39af0293 authored 1 year ago by Martin Weise
--- a/.docs/images/DS-icon_white_hiRes.png
+++ b/.docs/images/DS-icon_white_hiRes.png
--- a/.docs/images/architecture-core.png
+++ b/.docs/images/architecture-core.png
--- a/.docs/images/architecture-core.svg
+++ b/.docs/images/architecture-core.svg
--- a/.docs/images/architecture.png
+++ b/.docs/images/architecture.png
--- a/.docs/images/auth-create.png
+++ b/.docs/images/auth-create.png
--- a/.docs/images/deployment-tuwien.png
+++ b/.docs/images/deployment-tuwien.png
--- a/.docs/images/deployment.png
+++ b/.docs/images/deployment.png
--- a/.docs/images/illustration.jpg
+++ b/.docs/images/illustration.jpg
--- a/.docs/images/logos.png
+++ b/.docs/images/logos.png
--- a/.docs/images/minio-download.png
+++ b/.docs/images/minio-download.png
--- a/.docs/images/minio-upload.png
+++ b/.docs/images/minio-upload.png