Skip to content
Snippets Groups Projects
Commit d8d2ded8 authored by FALKE JANOS's avatar FALKE JANOS :island:
Browse files

Merge branch 'develop' of https://git.unistra.fr/erp-sil/student into develop 

# Conflicts:
#	backend/models/user.js
#	frontend/src/App.js
#	frontend/src/actions/Login.actions.js
parents 9da05637 27da5c29
Branches
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 308 additions and 202 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