Richard Alam 6adf6b516e Merge branch 'master' into send-receive-chat-from-js-api		2012-11-07 16:13:35 +00:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge branch 'master' into send-receive-chat-from-js-api	2012-11-07 16:13:35 +00:00
config.xml.template	- add options in config.xml to display the webcam controls	2012-11-01 17:46:43 +00:00