Felipe Cecagno a3acb00893 Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 ... Conflicts: bbb-video/build.gradle bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as bigbluebutton-config/web/default.pdf		2014-11-22 20:28:39 -02:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1	2014-11-22 20:28:39 -02:00
config.xml.template	Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1	2014-11-22 20:28:39 -02:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00