Felipe Cecagno c072bbd410 Merge branch 'webrtc-timeout' into mconf-live0.6.3		2015-05-21 12:54:58 -03:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge branch 'webrtc-timeout' into mconf-live0.6.3	2015-05-21 12:54:58 -03:00
config.xml.template	Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release	2015-05-17 19:25:26 -03:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00