3 Commits

Author	SHA1	Message	Date
Lucas Zawacki	3f6cc062a9	Merge winston logging ... Conflicts: labs/meteor-client/app/.meteor/packages labs/meteor-client/app/lib/router.coffee labs/meteor-client/app/server/collection_methods/chat.coffee labs/meteor-client/app/server/collection_methods/users.coffee labs/meteor-client/app/server/redispubsub.coffee labs/meteor-client/app/smart.json labs/meteor-client/app/smart.lock	2014-11-12 13:18:09 -02:00
Anton Georgiev	baa40e441b	temporarily reduce the amount of logging	2014-10-16 20:31:15 +00:00
Anton Georgiev	319a1247a1	Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth ... Conflicts: labs/meteor-client/app/client/globals.coffee labs/meteor-client/app/client/views/chat/chat_bar.coffee labs/meteor-client/app/collections/chat.coffee labs/meteor-client/app/collections/meetings.coffee labs/meteor-client/app/collections/presentations.coffee labs/meteor-client/app/collections/shapes.coffee labs/meteor-client/app/collections/slides.coffee labs/meteor-client/app/collections/users.coffee	2014-10-07 17:45:47 +00:00