Jeff Morgan b66bbc2c0d Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix ... Conflicts: meteor/client/lib/boot2docker.js meteor/client/lib/utilities.js meteor/client/lib/virtualbox.js meteor/client/main.js meteor/client/views/dashboard/setup/setup-install.js meteor/server/docker.js		2014-09-01 04:00:06 -07:00
..
boot2docker.js	Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix	2014-09-01 04:00:06 -07:00
installer.js	Fixing common installer bugs	2014-09-01 03:25:31 -07:00
requires.js	Refactored utilities.	2014-08-31 21:07:22 -07:00
router.js	Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix	2014-09-01 04:00:06 -07:00
startup.js	Initial commit	2014-08-27 13:45:22 -07:00
sync.js	Refactored code and fixed bin dir path issue.	2014-08-31 22:10:32 -07:00
utilities.js	Fixing common installer bugs	2014-09-01 03:25:31 -07:00
virtualbox.js	Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix	2014-09-01 04:00:06 -07:00