Merge branch 'main' into 'feature/admin-view'

# Conflicts:
#   client/src/components/Sidebar/Sidebar.jsx
#   client/src/constants/viewKeys.js
This commit is contained in:
Dan Hansen
2025-08-13 22:42:56 +00:00
3 changed files with 22 additions and 20 deletions
+4 -1
View File
@@ -18,5 +18,8 @@ export const VIEW_LABELS = {
medataentry: "M&E Data Entry",
projectcollector: "Project Collector",
nasapplication: "NAS Application",
ivans: "IVANS"
ivans: "IVANS",
settings: "Settings",
personal: "Personal Info",
security: "Security",
};