mirror of
https://github.com/Mueller-Patrick/Betterzon.git
synced 2026-11-19 16:40:31 +00:00
# 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