perroned ce41c6798d Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth ... Conflicts: labs/meteor-client/app/client/views/whiteboard/slide.coffee labs/meteor-client/app/server/collection_methods/users.coffee		2014-10-16 06:15:13 -07:00
..
user_item.coffee	Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth	2014-10-07 19:52:51 +00:00
user_item.html	fixes for isCurrentUserTalking	2014-10-14 22:38:15 +00:00
user_list.coffee	Removing presenter functionality from this viewer branch.	2014-10-14 08:51:08 -07:00
users_list.html	Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth	2014-10-07 17:45:47 +00:00