Anton Georgiev 3ad1bdd341 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat ... Conflicts: labs/meteor-client/client/globals.coffee labs/meteor-client/client/views/chat/chat_bar.coffee labs/meteor-client/collections/collections.coffee labs/meteor-client/lib/router.coffee labs/meteor-client/server/publish.coffee labs/meteor-client/server/server.coffee		2014-07-09 15:09:27 +00:00
..
chat.coffee	Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat	2014-07-09 15:09:27 +00:00
collections.coffee	Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat	2014-07-09 15:09:27 +00:00
meetings.coffee	changed logging style	2014-07-07 18:03:33 +00:00
shapes.coffee	adding a shape to the collection	2014-07-07 20:17:09 +00:00
slides.coffee	fixed adding to Slides collection	2014-07-08 17:15:30 +00:00
users.coffee	fix removing users from Users	2014-07-03 18:44:05 +00:00