Merge branch 'develop' into feature/org_improvements

COS301-SE-2024 · Sep 26, 2024 · 0a5373c · 0a5373c
2 parents fc2ef2a + 9623aa1
commit 0a5373c
Show file tree

Hide file tree

Showing 110 changed files with 373 additions and 11,848 deletions.
diff --git a/backend/.gitignore b/backend/.gitignore
@@ -134,4 +134,4 @@ out
 node_modules
 # dist
 .env
-# public/
+public/
diff --git a/backend/public/248.server.js b/backend/public/248.server.js
diff --git a/backend/public/__tests__/controllers/commentController.test.js b/backend/public/__tests__/controllers/commentController.test.js
diff --git a/backend/public/__tests__/controllers/issueController.test.js b/backend/public/__tests__/controllers/issueController.test.js
diff --git a/backend/public/__tests__/controllers/locationController.test.js b/backend/public/__tests__/controllers/locationController.test.js
diff --git a/backend/public/__tests__/controllers/reactionController.test.js b/backend/public/__tests__/controllers/reactionController.test.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,4 +134,4 @@ out @@
     node_modules
     # dist
     .env
-    # public/
+    public/