perroned efca225a83 Merge remote-tracking branch 'maxim/meteor-client-new-ui' into foundation-notifications ... Conflicts: bigbluebutton-html5/app/client/globals.coffee bigbluebutton-html5/app/client/views/users/users_list.html		2015-05-13 12:05:34 -07:00
..
user_item.coffee	Major clean up	2015-05-13 11:55:15 -07:00
user_item.html	Major clean up	2015-05-13 11:55:15 -07:00
user_list.coffee	merge	2015-05-06 23:15:08 -07:00
users_list.html	Merge remote-tracking branch 'maxim/meteor-client-new-ui' into foundation-notifications	2015-05-13 12:05:34 -07:00