Pedro Beschorner Marin 415393ca30 Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0 ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml		2016-06-27 13:10:58 +00:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0	2016-06-17 18:00:51 +00:00
config.xml.template	Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0	2016-06-27 13:10:58 +00:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00