Merge remote-tracking branch 'origin/master'

# Conflicts:
#	frontend/src/app/login/page-login/page-login.component.ts
#	frontend/src/environments/environment.ts
This commit is contained in:
Yûki VACHOT 2022-01-13 22:08:54 +01:00
commit b42aa64c57
35 changed files with 913 additions and 371 deletions

View file

@ -1,9 +1,10 @@
// This file can be replaced during build by using the `fileReplacements` array.
// `ng build` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`.
export const environment = {
production: false,
api_url: '${API_URL}'
production: false,
debutUrl: "http://127.0.0.1:5000/api/"
};
/*