Oleksandr Zhurbenko 933ffe102f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui ... Conflicts: bigbluebutton-html5/app/client/views/chat/chat_bar.coffee		2015-05-24 20:32:13 -07:00
..
chat_bar.coffee	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui	2015-05-24 20:32:13 -07:00
chat_bar.html	Search for a username to display on the private chat tab	2015-05-24 20:19:57 -07:00