Gustavo Salazar edf9518a31 Merge master branch to add style in mic settings.		2014-02-10 11:03:15 -08:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge master branch to add style in mic settings.	2014-02-10 11:03:15 -08:00
config.xml.template	Merged with https://github.com/mconf/bigbluebutton/tree/webrtc_support	2014-02-07 16:56:23 -08:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00