Chad Pilkey 493696d1f2 Merge remote branch 'origin/master' into access-hotfix ... Conflicts: bigbluebutton-client/resources/config.xml.template bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml		2013-01-10 14:36:57 -05:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge remote branch 'origin/master' into access-hotfix	2013-01-10 14:36:57 -05:00
config.xml.template	Merge remote branch 'origin/master' into access-hotfix	2013-01-10 14:36:57 -05:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00