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
..
config	Typedoc config updated to avoid protected classes	2020-09-22 17:15:12 +02:00
src	Merge branch 'master' into mediasoup FIXME CONFLICT	2021-01-22 14:17:00 +01:00
.gitignore	openvidu-browser: static folder ignored	2019-08-09 14:06:05 +02:00
.npmignore	npmignore files ignoring docs/ folders	2018-09-14 14:51:01 +02:00
LICENSE	openvidu-browser 2.0.0 refactoring	2018-04-26 15:33:47 +02:00
generate-docs.sh	openvidu-browser and openvidu-node-client generate-docs.sh	2020-04-05 21:34:10 +02:00
package.json	openvidu-browser: better browserify build command (creates output folder)	2020-12-03 11:22:51 +01:00
tsconfig.json	openvidu-browser: tsconfig.json file to root dir	2019-04-22 14:49:42 +02:00