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
..
compatibility	Changed webrtc call to use nginx websocket.	2014-10-09 09:35:39 -07:00
lib	switch to nemo64:bootstrap	2014-10-21 19:15:35 +00:00
stylesheets	Merge branch 'meteor-new-auth' of github.com:antobinary/bigbluebutton into testing-version-004	2014-11-04 20:51:45 +00:00
views	Switch to private conversations.	2014-11-04 07:38:18 -08:00
whiteboard_models	Merge remote-tracking branch 'anton/meteor-disconnection-02' into meteor-new-auth	2014-11-04 06:20:55 -08:00
globals.coffee	Merge remote-tracking branch 'anton/meteor-disconnection-02' into meteor-new-auth	2014-11-04 06:20:55 -08:00
main.coffee	Merge remote-tracking branch 'anton/meteor-disconnection-02' into meteor-new-auth	2014-11-04 06:20:55 -08:00
main.html	client side notification when disconnected/reconnecting	2014-10-30 15:00:45 +00:00