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
..
user_item.coffee	Comments	2015-05-21 07:41:58 -07:00
user_item.html	Use correct listen only icon in userlist and navbar	2015-05-14 09:56:41 -07:00
user_list.coffee	merge	2015-05-06 23:15:08 -07:00
users_list.html	Underline meeting title	2015-05-13 12:10:42 -07:00