Patrick Müller e0f1724d95 Merge remote-tracking branch 'origin/develop' into BETTERZON-52 ... # Conflicts: # Frontend/angular.json # Frontend/package-lock.json # Frontend/package.json # Frontend/src/app/app.module.ts # Frontend/src/index.html		2021-04-08 10:52:52 +02:00
..
e2e	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00
res	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00
src	Merge remote-tracking branch 'origin/develop' into BETTERZON-52	2021-04-08 10:52:52 +02:00
.browserslistrc	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00
.editorconfig	BETTERZON-33: Fixed issues with npm	2020-12-01 22:22:09 +01:00
angular.json	Merge remote-tracking branch 'origin/develop' into BETTERZON-52	2021-04-08 10:52:52 +02:00
Frontend.iml	BETTERZON-38: Added error handler, preparation for DB accessing	2020-11-25 00:38:16 +01:00
karma.conf.js	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00
package-lock.json	Merge remote-tracking branch 'origin/develop' into BETTERZON-52	2021-04-08 10:52:52 +02:00
package.json	Merge remote-tracking branch 'origin/develop' into BETTERZON-52	2021-04-08 10:52:52 +02:00
tsconfig.app.json	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00
tsconfig.json	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00
tsconfig.spec.json	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00
tslint.json	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00