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
..
stylesheets	Added private chat and chat tabs functionality. Tab UI is still buggy.	2014-07-09 06:18:52 -07:00
views	Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat	2014-07-09 15:09:27 +00:00
globals.coffee	Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-merge-private-chat	2014-07-09 15:09:27 +00:00
main.coffee	By default youre in public chat	2014-07-09 06:16:17 -07:00
main.html	Changed some toggles, fixed up some UI, more chat functionality	2014-06-26 10:13:19 -07:00