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	Added private chat and chat tabs functionality. Tab UI is still buggy.	2014-07-09 06:18:52 -07:00
logout	Cleaning up the code a bit, placed rendering logic inside individual templates to be a bit neater	2014-06-23 12:54:17 -07:00
users	Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server	2014-07-02 19:10:12 +00:00
whiteboard	Added sample whiteboard entry	2014-06-23 12:51:54 -07:00
layout.html	Cleaning up the code a bit, placed rendering logic inside individual templates to be a bit neater	2014-06-23 12:54:17 -07:00