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
..
docker	Update to Node 14 in Dockerfiles	2020-11-16 18:25:10 +01:00
jenkins	openvidu-server: signalSent event	2020-11-15 01:15:52 +01:00
src/test	Merge branch 'master' into mediasoup FIXME CONFLICT	2021-01-22 14:17:00 +01:00
pom.xml	openvidu-test-e2e: refactor recording utilities to openvidu-test-browsers	2020-12-02 18:43:43 +01:00