merge with dev

2021-07-13 12:20:59 +03:00
parent ead404fc72 4526f2629d
commit af0211721c
21 changed files with 405 additions and 501 deletions
--- a/server.py
+++ b/server.py
@@ -1,4 +1,9 @@
 import uvicorn
+from settings import PORT

 if __name__ == '__main__':
+<<<<<<< HEAD
    uvicorn.run("main:app", host="0.0.0.0", port=8081, ssl_keyfile="discours.key", ssl_certfile="discours.crt", reload=True)
+=======
+    uvicorn.run("main:app", host="0.0.0.0", port=PORT, reload=True)
+>>>>>>> remotes/origin/dev