ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
openvidu/openvidu-server/deployments/ce/docker-compose
History
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
..
owncert Deployment repos migration: 2020-07-16 20:09:48 +02: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-server and openvidu-server-pro images 2020-12-10 20:48:49 +01:00
install_openvidu.sh openvidu-deployment: Update CE upgrade install_openvidu.sh 2020-12-10 10:39:07 +01:00
openvidu Add all kurento logs saved on generating report in CE 2020-11-05 15:18:47 +01:00