mirror of
https://github.com/Mueller-Patrick/Betterzon.git
synced 2024-12-23 12:15:11 +00:00
Patrick Müller
5712c5c69e
# Conflicts: # Frontend/src/app/app.component.html # Frontend/src/app/app.module.ts # Frontend/src/app/components/top-bar/top-bar.component.css # Frontend/src/app/components/top-bar/top-bar.component.html # Frontend/src/app/pages/landingpage/landingpage.component.html # Frontend/src/styles.css |
||
---|---|---|
.. | ||
e2e | ||
res | ||
src | ||
.browserslistrc | ||
.editorconfig | ||
angular.json | ||
Frontend.iml | ||
karma.conf.js | ||
package-lock.json | ||
package.json | ||
tsconfig.app.json | ||
tsconfig.json | ||
tsconfig.spec.json | ||
tslint.json |