Felipe Cecagno 3d075f81a5 Merge remote-tracking branch 'mconf/mconf-live0.7.6' into mconf ... Conflicts: bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala bigbluebutton-client/resources/prod/MconfLive.html bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar		2017-01-25 00:01:05 -02:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge remote-tracking branch 'mconf/mconf-live0.7.6' into mconf	2017-01-25 00:01:05 -02:00
config.xml.template	Merge remote-tracking branch 'mconf/mconf-live0.7.6' into mconf	2017-01-25 00:01:05 -02:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00