Oleksandr Zhurbenko 7e4b134298 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui ... Conflicts: bigbluebutton-html5/app/client/globals.coffee bigbluebutton-html5/app/client/main.html bigbluebutton-html5/app/client/views/sharedTemplates.html		2015-07-03 12:48:05 -07:00
..
user_item.coffee	Added styling and icons as notifications for the user list	2015-06-26 15:58:23 -07:00
user_item.html	Added styling and icons as notifications for the user list	2015-06-26 15:58:23 -07:00
user_list.coffee	Added notifications for unread private messages	2015-06-24 17:21:50 -07:00
users_list.html	Added animations to the sliding menu.	2015-06-18 12:09:17 -07:00