Ghazi Triki 7ec8c6e3b7 Merge branch 'master' into emoji-status ... Conflicts: bigbluebutton-client/branding/default/style/css/BBBDefault.css		2015-08-28 19:06:48 +01:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge branch 'master' into emoji-status	2015-08-28 19:06:48 +01:00
config.xml.template	Configuration property enableRaiseHand renamed to enableEmojiStatus.	2015-08-23 16:35:10 +01:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00