Merge remote-tracking branch 'origin/main' into feature/241

# Conflicts: # frontend/src/AppContent.tsx
urinaner · Jan 3, 2025 · e8d8b17 · e8d8b17
2 parents f6caaf4 + 56618e3
commit e8d8b17
Show file tree

Hide file tree

Showing 68 changed files with 2,648 additions and 671 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml
diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
diff --git a/.idea/prettier.xml b/.idea/prettier.xml
diff --git a/.idea/shelf/24__10__13___1_43_________Changes_.xml b/.idea/shelf/24__10__13___1_43_________Changes_.xml
diff --git a/.idea/shelf/24__10__13__오후_1_43,_체크아웃_전에_커밋되지_않은_변경_내용_[Changes]/shelved.patch b/.idea/shelf/24__10__13__오후_1_43,_체크아웃_전에_커밋되지_않은_변경_내용_[Changes]/shelved.patch
diff --git a/.idea/shelf/24__10__13__오후_1_43,_체크아웃_전에_커밋되지_않은_변경_내용_[Changes]1/shelved.patch b/.idea/shelf/24__10__13__오후_1_43,_체크아웃_전에_커밋되지_않은_변경_내용_[Changes]1/shelved.patch
diff --git a/.idea/swagger-settings.xml b/.idea/swagger-settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml