Juan Navarro 5e9511a376 Merge branch 'master' into mediasoup FIXME CONFLICT ... This merge commit includes 2 merge conflicts: * openvidu-browser/src/OpenVidu/Session.ts In modern code, the OpenVidu version is obtained through other means. However in the mediasoup branch this value is used in several of the *LEGACY.ts files. * openvidu-browser/src/OpenViduInternal/WebRtcPeer/WebRtcPeer.ts In the mediasoup branch, the special treatment for ionic was removed: openvidu-browser: removed Ionic iOS timeout on first subscription 23d64be806 and also the method was converted into async and returned a Promise. However in master the code is still like the old one.		2021-01-22 14:17:00 +01:00
..
beats	openvidu-deployment: Drop unnecessary docker logs from filebeat	2020-11-26 11:27:40 +01:00
cluster/aws	openvidu-deployment: Increased Media Node volume size and parametrize it through '.env'. Bump OPENVIDU_RECORDING_IMAGE in media-node-controller	2020-12-10 22:21:22 +01:00
.env	Merge branch 'master' into mediasoup FIXME CONFLICT	2021-01-22 14:17:00 +01:00
docker-compose.override.yml	Update docker-compose to 2.16.0	2020-11-12 16:36:15 +01:00
docker-compose.yml	openvidu-deployment: Update openvidu/openvidu-server-pro to 2.17.0-dev5	2021-01-11 16:41:32 +01:00
install_openvidu_pro.sh	openvidu-deployment: Update PRO installation scripts	2020-12-10 10:51:35 +01:00
openvidu	openvidu-deployment: Not use inline if in openvidu script	2020-11-26 14:26:26 +01:00