Felipe Cecagno 0037acd648 Merge branch '090-white-startup' into mconf-live0.6.1 ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml		2014-10-15 14:52:55 -03:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge branch '090-white-startup' into mconf-live0.6.1	2014-10-15 14:52:55 -03:00
config.xml.template	Merge branch '090-listen-only-by-default' into mconf-live0.6.1	2014-10-15 00:22:27 -03:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00