Felipe Cecagno d98bee07cf 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		2016-01-12 15:27:01 -02:00
..
bbbResources.properties	Merge webrtc-reconnect into bigbluebutton/master	2016-01-12 15:27:01 -02:00