Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tobias Eidelpes 2021-05-03 15:59:14 +02:00
commit f5b8ef21a2
3 changed files with 34 additions and 18437 deletions

1
.gitignore vendored
View File

@ -6,6 +6,7 @@ node_modules/
venv/ venv/
env/ env/
db/
.DS_Store .DS_Store

View File

@ -11,6 +11,10 @@ services:
context: ./backend context: ./backend
dockerfile: ./Dockerfile dockerfile: ./Dockerfile
command: python manage.py runserver 0.0.0.0:8000 command: python manage.py runserver 0.0.0.0:8000
env_file:
- .env
volumes:
- ./db:/code/app_be/db
ports: ports:
- 8000:8000 - 8000:8000

18466
frontend/package-lock.json generated

File diff suppressed because it is too large Load Diff