Merge branch 'main' into release

snuhcs-course · Dec 10, 2023 · df577d6 · df577d6
2 parents e4b8096 + 6afabaf
commit df577d6
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 # Edit at https://www.toptal.com/developers/gitignore?templates=androidstudio,kotlin
 
 .DS_store
+docs/.DS_Store
+
 
 ### Kotlin ###
 # Compiled class file

diff --git a/docs/Team2-UAT-spec-docs.pdf b/docs/Team2-UAT-spec-docs.pdf
diff --git a/docs/images/Emoji_Tab.png b/docs/images/Emoji_Tab.png
diff --git a/docs/images/Feed_Tab.png b/docs/images/Feed_Tab.png
diff --git a/docs/images/Login_Signup.png b/docs/images/Login_Signup.png
diff --git a/docs/images/Profile_Tab.png b/docs/images/Profile_Tab.png
diff --git a/docs/images/System_Architecture.png b/docs/images/System_Architecture.png