Anton Georgiev 3075166fa8 Merge branch 'meteor-merge-private-chat' into meteor-rebuild-server ... Conflicts: labs/meteor-client/client/views/chat/chat_bar.coffee		2014-07-28 19:56:40 +00:00
..
chat.coffee	Merge branch 'meteor-merge-private-chat' into meteor-rebuild-server	2014-07-28 19:56:40 +00:00
collections.coffee	Fixing up chat tabs... again.	2014-07-17 08:25:56 -07:00
meetings.coffee	changed logging style	2014-07-07 18:03:33 +00:00
shapes.coffee	coffeescript proper style	2014-07-09 19:09:10 +00:00
slides.coffee	coffeescript proper style	2014-07-09 19:09:10 +00:00
users.coffee	Merge branch 'meteor-merge-private-chat' into meteor-rebuild-server	2014-07-28 19:56:40 +00:00