perroned 554ce1d06b Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call ... Conflicts: bigbluebutton-html5/app/client/main.html bigbluebutton-html5/app/client/stylesheets/style.less bigbluebutton-html5/app/client/views/chat/chat_bar.html		2015-04-22 06:03:46 -07:00
..
chat_bar.coffee	private chat user pick from dropdown	2015-03-17 19:34:34 +00:00
chat_bar.html	Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call	2015-04-22 06:03:46 -07:00