Patrick Müller 8987d3deff Merge remote-tracking branch 'origin/develop' into BETTERZON-106 ... # Conflicts: # Frontend/src/app/app.component.html # Frontend/src/app/app.module.ts # Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.css # Frontend/src/app/pages/landingpage/landingpage.component.html # Frontend/src/styles.css		2021-05-20 10:46:06 +02:00
..
app	Merge remote-tracking branch 'origin/develop' into BETTERZON-106	2021-05-20 10:46:06 +02:00
assets	BETTERZON-109 (#57)	2021-05-20 10:36:52 +02:00
environments	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00
favicon.ico	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00
index.html	BETTERZON-31, BETTERZON-50 (#25)	2021-04-08 11:28:05 +02:00
main.ts	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00
polyfills.ts	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00
styles.css	BETTERZON-109 (#57)	2021-05-20 10:36:52 +02:00
test.ts	Restructuring project to have different Modules for Frontend, Tests, Backend etc...	2020-11-12 10:32:49 +01:00
themes.scss	BETTERZON-78 (#39)	2021-05-20 10:26:10 +02:00