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
..
.meteor	Merge winston logging	2014-11-12 13:18:09 -02:00
client	we have the .coffee now	2014-11-12 09:58:24 -05:00
collections	Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth	2014-10-07 17:45:47 +00:00
lib	Merge winston logging	2014-11-12 13:18:09 -02:00
server	Merge winston logging	2014-11-12 13:18:09 -02:00
config.coffee	Merge winston logging	2014-11-12 13:18:09 -02:00
packages.json	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
smart.json	Merge winston logging	2014-11-12 13:18:09 -02:00
smart.lock	Merge winston logging	2014-11-12 13:18:09 -02:00