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
..
chat	Major clean up	2015-05-13 11:55:15 -07:00
modals	Major clean up	2015-05-13 11:55:15 -07:00
users	Merge remote-tracking branch 'maxim/meteor-client-new-ui' into foundation-notifications	2015-05-13 12:05:34 -07:00
whiteboard	Major clean up	2015-05-13 11:55:15 -07:00
layout.html	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
sharedTemplates.html	Fix button maker	2015-05-12 12:47:58 -07:00