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
..
bbblogger.coffee	Added some whitespace	2014-06-24 11:20:18 -07:00
collection-permissions.js	Added some whitespace	2014-06-24 11:20:18 -07:00
publish.coffee	Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat	2014-07-09 15:09:27 +00:00
redispubsub.coffee	fixed adding to Slides collection	2014-07-08 17:15:30 +00:00
server.coffee	Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat	2014-07-09 15:09:27 +00:00