Jeff Morgan e8fe955cfd Merge branch 'master' into rc0.2.0 ... Conflicts: index.js meteor/.meteor/packages meteor/client/lib/apputil.js meteor/client/lib/boot2docker.js meteor/client/lib/docker.js meteor/client/lib/installer.js meteor/client/lib/router.js meteor/client/lib/startup.js meteor/client/lib/util.js meteor/client/lib/virtualbox.js meteor/client/views/dashboard/apps/dashboard-apps-settings.js meteor/client/views/dashboard/apps/dashboard-single-app.js meteor/client/views/dashboard/components/modal-create-image.js meteor/client/views/dashboard/images/dashboard-images-settings.js meteor/client/views/dashboard/setup/setup-install.html meteor/client/views/dashboard/setup/setup-install.js meteor/client/views/dashboard/setup/setup-layout.html meteor/server/publications.js meteor/smart.json meteor/smart.lock package.json resources/install script/dist.sh script/setup.sh script/versions.sh		2014-09-10 22:28:26 -07:00
..
lib	Moved server code to the client side for performance.	2014-09-03 18:17:46 -07:00
publications.js	Merge branch 'master' into rc0.2.0	2014-09-10 22:28:26 -07:00