perroned 020df250a6 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into webrtc-utils ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml		2017-07-09 14:39:57 -04:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into webrtc-utils	2017-07-09 14:39:57 -04:00
config.xml.template	Add showWebRTCMOS option.	2017-06-05 13:28:24 +01:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00