Patrick Müller 5712c5c69e Merge remote-tracking branch 'origin/develop' into BETTERZON-109 ... # 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		2021-05-20 10:35:41 +02:00
..
unused/scrapy	BETTERZON-58 (#53)	2021-05-19 00:46:14 +02:00
api.py	BETTERZON-58 (#53)	2021-05-19 00:46:14 +02:00
Crawler.iml	Merge remote-tracking branch 'origin/develop' into BETTERZON-109	2021-05-20 10:35:41 +02:00
crawler.py	BETTERZON-58 (#53)	2021-05-19 00:46:14 +02:00
Dockerfile	BETTERZON-49 (#24)	2021-04-07 23:34:08 +02:00
requirements.txt	BETTERZON-58 (#53)	2021-05-19 00:46:14 +02:00
sql.py	BETTERZON-58 (#53)	2021-05-19 00:46:14 +02:00