Felipe Cecagno 8f08e13dcc Merge remote-tracking branch 'bigbluebutton/master' into mconf ... Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js		2015-12-30 18:35:13 -02:00
..
css	Merge remote-tracking branch 'bigbluebutton/master' into mconf	2015-12-30 18:35:13 -02:00