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
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
..
ce Merge branch 'master' into mediasoup FIXME CONFLICT 2021-01-22 14:17:00 +01:00
pro Merge branch 'master' into mediasoup FIXME CONFLICT 2021-01-22 14:17:00 +01:00