Merge remote-tracking branch 'origin/master'
# Conflicts: # backend/application/api_functions.py
This commit is contained in:
commit
f1ae473b40
12 changed files with 2 additions and 3 deletions
BIN
backend/__pycache__/app.cpython-38.pyc
Normal file
BIN
backend/__pycache__/app.cpython-38.pyc
Normal file
Binary file not shown.
BIN
backend/__pycache__/config.cpython-38.pyc
Normal file
BIN
backend/__pycache__/config.cpython-38.pyc
Normal file
Binary file not shown.
BIN
backend/application/__pycache__/__init__.cpython-38.pyc
Normal file
BIN
backend/application/__pycache__/__init__.cpython-38.pyc
Normal file
Binary file not shown.
Binary file not shown.
BIN
backend/application/__pycache__/logs_model.cpython-38.pyc
Normal file
BIN
backend/application/__pycache__/logs_model.cpython-38.pyc
Normal file
Binary file not shown.
BIN
backend/application/__pycache__/responses.cpython-38.pyc
Normal file
BIN
backend/application/__pycache__/responses.cpython-38.pyc
Normal file
Binary file not shown.
BIN
backend/application/__pycache__/routes.cpython-38.pyc
Normal file
BIN
backend/application/__pycache__/routes.cpython-38.pyc
Normal file
Binary file not shown.
BIN
backend/application/__pycache__/sessionJWT.cpython-38.pyc
Normal file
BIN
backend/application/__pycache__/sessionJWT.cpython-38.pyc
Normal file
Binary file not shown.
Binary file not shown.
|
|
@ -4,4 +4,3 @@ export FLASK_DEBUG=1
|
|||
export PYTHONUNBUFFERED=1
|
||||
export DATABASE_URL_USERS=postgresql://flaskaled1:aled1@localhost:5433/flaskaledDb1
|
||||
export DATABASE_URL_LOGS=postgresql://flaskaled2:aled2@localhost:5434/flaskaledDb2
|
||||
export SECRET_KEY=\xe6\xfe9;\xddA\x00\xca\xd4\xbb\x05q\xd9q\xe6e\x98DC\x08:+\xc9\x893\xd6\xa7\xea\x1e\x05\x03\xdc
|
||||
0
backend/init-db1.sql
Normal file → Executable file
0
backend/init-db1.sql
Normal file → Executable file
Loading…
Add table
Add a link
Reference in a new issue