Jeff Morgan 31ed93283d 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
..
.meteor	Merge branch 'analytics' of github.com:kitematic/kitematic into rc0.2.0	2014-09-07 23:51:25 -07:00
client	Merge branch 'master' into rc0.2.0	2014-09-10 22:28:26 -07:00
collections	Adding setup page for usage diagnostics	2014-09-10 19:39:25 -07:00
lib	Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix	2014-09-04 02:39:13 -07:00
packages	Cleaned package gitignore.	2014-09-10 11:56:28 -07:00
public	Adding setup page for usage diagnostics	2014-09-10 19:39:25 -07:00
server	Merge branch 'master' into rc0.2.0	2014-09-10 22:28:26 -07:00
.gitignore	Initial commit	2014-08-27 13:45:22 -07:00
.jshintrc	Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix	2014-09-04 02:39:13 -07:00
jshint.sh	Initial commit	2014-08-27 13:45:22 -07:00
settings_dev.json	Added GA to track usage analytics and option to disable it.	2014-09-05 19:52:03 -07:00