Merge branch 'develop' into usersLimit

# Conflicts:
#	back/src/Services/SocketManager.ts
This commit is contained in:
Gregoire Parant 2020-11-01 12:00:31 +01:00
commit 00ce899a74
23 changed files with 371 additions and 148 deletions

View file

@ -1,5 +1,4 @@
import {App} from "../Server/sifrr.server";
import {IoSocketController} from "_Controller/IoSocketController";
import {HttpRequest, HttpResponse} from "uWebSockets.js";
const register = require('prom-client').register;
const collectDefaultMetrics = require('prom-client').collectDefaultMetrics;