Merge branch 'main' into 'formulaire_fini' (8444f4cb) · Commits · Ratiscrum / NDLI

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 8444f4cb authored 3 years ago by

CEYLAN EREN

Browse files

Merge branch 'main' into 'formulaire_fini'

# Conflicts:
#   app/Http/Controllers/AddRescuerController.php
#   routes/web.php

parents fdc8d7c8 7785f334

Branches

1 merge request!29ajout

Hide whitespace changes

Inline Side-by-side

Showing with 68 additions and 70 deletions

Please register or to comment

Admin message

Merge branch 'main' into 'formulaire_fini'