[Fix] Merging,meld,rebase, cherrypick from D4rkHeart to Master
parent
75493551
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- API/app/Http/Middleware/JwtMiddleware.php 18 additions, 1 deletionAPI/app/Http/Middleware/JwtMiddleware.php
- Docker/Dockerfile-api.dockerfile 1 addition, 0 deletionsDocker/Dockerfile-api.dockerfile
- Docker/docker-entrypoint-gest.sh 3 additions, 3 deletionsDocker/docker-entrypoint-gest.sh
- Formulaire/configs/db.php 2 additions, 5 deletionsFormulaire/configs/db.php
- Formulaire/templates/formParts/edit/responsibles.php 9 additions, 2 deletionsFormulaire/templates/formParts/edit/responsibles.php
- Formulaire/tequila/tequila.php 1 addition, 1 deletionFormulaire/tequila/tequila.php
- Gestion/src/views/ApplicationsView.vue 1 addition, 0 deletionsGestion/src/views/ApplicationsView.vue
Loading
Please register or sign in to comment