Merge branch 'main' into feature-ticket-32-import-image-assets-for-fr…

…ontend-team
SE4CPS · Feb 18, 2025 · 5a6ff9c · 5a6ff9c
2 parents 37670c6 + 1b742c6
commit 5a6ff9c
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 41 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/PlantWaterSystem.iml b/.idea/PlantWaterSystem.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml