Richard Alam 37c744b01b Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf		2017-07-20 10:25:36 -07:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf	2017-07-20 10:25:36 -07:00
config.xml.template	Merge branch 'master-v2' into 2x-client-theme	2017-07-18 18:38:46 +01:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00