Skip to content
Snippets Groups Projects
Commit 48b94e66 authored by Jessie Ragot's avatar Jessie Ragot
Browse files

Merge branch 'main' into Hayat2

# Conflicts:
#	src/main/resources/templates/admin-dashboard.html
#	src/main/resources/templates/doctor-dashboard.html
parents 66319f66 e1c2c2cc
No related branches found
No related tags found
1 merge request!22modification of the entire front end structure
Showing
with 305 additions and 30 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment