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
..
.meteor	Merge branch 'meteor-ui-less' of github.com:antobinary/bigbluebutton into testing-version-007	2014-11-28 23:44:32 +00:00
client	Merge branch 'meteor-ui-less' of github.com:antobinary/bigbluebutton into testing-version-007	2014-11-28 23:44:32 +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	cleaning up router.coffee	2014-11-21 18:02:53 +00:00
server	publish chat based on userid, not dbid	2014-11-27 20:30:23 +00:00
tests/jasmine	Merge branch 'meteor-client-tests' of github.com:gthacoder/bigbluebutton into meteor-working-on-permissions	2014-11-18 15:55:29 +00:00
config.coffee	the reconnect button on logout logs you back in the meeting	2014-11-27 23:24:14 +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	Merge with testing and update to meteor only packages	2014-11-12 17:34:12 -02:00
smart.lock	Merge with testing and update to meteor only packages	2014-11-12 17:34:12 -02:00