Skip to content
Snippets Groups Projects
Commit 4b0fbc37 authored by Yibo Zhu's avatar Yibo Zhu
Browse files

Merge branch 'main' into... 

Merge branch 'main' into '60-as-a-user-i-want-to-view-and-edit-my-personal-information-on-my-profile-page-so-that-i-can'

# Conflicts:
#   src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/userDao.java
#   src/main/java/uk/ac/cf/spring/demo/sports/security/SecurityConfig.java
#   src/main/resources/static/html/UserCenter.html
parents f14a4762 1aaca182
No related branches found
No related tags found
5 merge requests!51Resolves 64,!49Resolve issue 70,!48Resolve issue 70,!47Revert "Merge branch '26-as-a-user-i-want-to-see-the-rankings-of-each-member' into 'main'",!33Resolve "As a user, I want to view and edit my personal information on my profile page so that I can manage and update my details"
Hide whitespace changes
Inline Side-by-side
Showing
with 753 additions and 43 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment