Skip to content
Snippets Groups Projects
Commit b3ef8b1a authored by heikkkk's avatar heikkkk
Browse files

Merge branch 'fix/accounts-can-belong-to-many-users' of... 

Merge branch 'fix/accounts-can-belong-to-many-users' of https://gitlab.stud.idi.ntnu.no/idatt2106-2024-07/backend into feat/add-banner-in-user-update

 Conflicts:
	src/main/java/no/ntnu/idi/stud/savingsapp/controller/user/UserController.java
parents a1253799 759b5f70
No related branches found
No related tags found
1 merge request!90Fix/accounts can belong to many users
Pipeline #284700 failed
Stage: build_test
Hide whitespace changes
Inline Side-by-side
Showing
with 137 additions and 52 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