52 Commits

Author	SHA1	Message	Date
Anton Georgiev	866bd4e539	minor things	2014-10-07 19:52:30 +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