Merge branch 'master' into feat/register

2021-04-29 17:37:17 +02:00
parent 56072ff282 947d8958a0
commit 753e4eb422
12 changed files with 481 additions and 459 deletions
--- a/api/router.js
+++ b/api/router.js
@@ -87,7 +87,6 @@ router.get("/chat/history", chatController.getAllHistory);
 router.delete("/chat/history", mustBeAuthenticated, chatController.deleteHistory);

 router.post("/login", userController.login);
-
 router.get("/logout", userController.logout);
 if(process.env !== "production") {
    // We don't want to hide registering behind a