Skip to content
Snippets Groups Projects
Commit 6ff6560d authored by HUSS THEOPHILE's avatar HUSS THEOPHILE
Browse files

Merge branch 'develop' into 'feature/42-add-user-login-signup'

# Conflicts:
#   src/app/modules/profile/profile-info/profile-info.component.html
#   src/app/modules/profile/profile-info/profile-info.component.ts
parents 76b95152 7384b2e4
Branches
1 merge request!44Feature/42 add user login signup
Pipeline #303304 passed with stages
in 45 seconds
Showing
with 477 additions and 230 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