Anton Georgiev 7b9de8041f Merge branch 'meteor-new-auth' of github.com:antobinary/bigbluebutton into testing-version-004 ... Conflicts: labs/meteor-client/app/client/stylesheets/chat.less labs/meteor-client/app/client/stylesheets/style.css		2014-11-04 20:51:45 +00:00
..
.meteor	client side notification when disconnected/reconnecting	2014-10-30 15:00:45 +00:00
client	Merge branch 'meteor-new-auth' of github.com:antobinary/bigbluebutton into testing-version-004	2014-11-04 20:51:45 +00: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	made sendMeetingInfoToClient to be a normal function; cleaning up	2014-10-31 15:25:32 +00:00
server	Merge remote-tracking branch 'anton/meteor-disconnection-02' into meteor-new-auth	2014-11-04 06:20:55 -08:00
config.coffee	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
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	update Meteor from 0.8.x to 0.9.4	2014-10-15 22:24:30 +00:00
smart.lock	update Meteor from 0.8.x to 0.9.4	2014-10-15 22:24:30 +00:00