Anton Georgiev 816a70f3bd Merge branch 'meteor-ui-less' of github.com:antobinary/bigbluebutton into testing-version-007 ... Conflicts: labs/meteor-client/app/.meteor/packages labs/meteor-client/app/.meteor/versions labs/meteor-client/app/client/stylesheets/users.less labs/meteor-client/app/client/views/users/user_item.html		2014-11-28 23:44:32 +00:00
..
lib	use userId instead of the changing dbid	2014-11-21 17:28:50 +00:00
stylesheets	Merge branch 'meteor-ui-less' of github.com:antobinary/bigbluebutton into testing-version-007	2014-11-28 23:44:32 +00:00
views	Merge branch 'meteor-ui-less' of github.com:antobinary/bigbluebutton into testing-version-007	2014-11-28 23:44:32 +00: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	must clear the chat tabs on logout	2014-11-28 16:41:00 +00:00
main.coffee	removed dbid	2014-11-27 22:08:33 +00:00
main.html	Merge branch 'master' of https://github.com/antobinary/bigbluebutton into meteor-client-viewer	2014-11-24 13:08:44 -08:00