Skip to content
Snippets Groups Projects
Commit 56eca77d authored by Titus Netland's avatar Titus Netland
Browse files

Merge remote-tracking branch 'origin/main' into delete_user 

# Conflicts:
#	src/components/UserProfileComponents/UserProfile.vue
#	src/services/user.service.js
parents b14eea24 1c392236
No related branches found
No related tags found
1 merge request!129Delete user
Pipeline #181627 passed
Stage: test