Merge branch 'develop' into 'feature/modify-profile' (ea2d12f6) · Commits · ERP (SIL) / STUDENT · GitLab

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit ea2d12f6 authored 3 years ago by

VOGT VICTOR

Merge branch 'develop' into 'feature/modify-profile'

# Conflicts:
#   frontend/src/containers/Profile.container.js
#   frontend/src/containers/SignUp.container.js

parents 0e36b77f bcc4af23

Branches

Hide whitespace changes

Inline Side-by-side

Showing with 7 additions and 340 deletions

Please register or to comment