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:
commit
b42aa64c57
35 changed files with 913 additions and 371 deletions
|
|
@ -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/"
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue