Skip to content
Snippets Groups Projects
Commit d98bee07 authored by Felipe Cecagno's avatar Felipe Cecagno
Browse files

Merge webrtc-reconnect into bigbluebutton/master

Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
parents 38bc6d4d 6b334951
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment