Skip to content
Snippets Groups Projects
Commit 1bb8c59d authored by Hugo SUBTIL's avatar Hugo SUBTIL
Browse files

Merge branch 'dev' into 'feat/change-email'

# Conflicts:
#   src/app/app-routing.module.ts
#   src/app/app.module.ts
parents e2cc673f 594e88a0
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment