Anton Georgiev 191d2d68ee Merge branch 'meteor-client-kicked-n-returning' of github.com:gthacoder/bigbluebutton into meteor-client-kicked-n-returning ... Conflicts: labs/meteor-client/app/client/main.html labs/meteor-client/app/client/views/users/user_list.coffee labs/meteor-client/app/server/user_permissions.coffee		2014-12-10 15:50:08 +00:00
..
collection_methods	clean up and improve logging	2014-12-09 20:45:20 +00:00
bbblogger.coffee	moving the meteor files into an app folder so that grunt can reside in the root without breaking meteor	2014-10-02 16:16:34 +00:00
publish.coffee	now we won't see 'ghost' users in the html5 client - users that registered but did not join	2014-12-10 00:33:56 +00:00
redispubsub.coffee	clean up and improve logging	2014-12-09 20:45:20 +00:00
server.coffee	we no longer use getMyInfo()	2014-11-21 17:35:04 +00:00
user_permissions.coffee	in a race condition the user did not have a user.role	2014-12-09 22:10:06 +00:00