Commit Graph

3 Commits

Author SHA1 Message Date
Jeff Morgan dc1cb0caec Adding update process 2014-09-01 17:19:19 -07:00
Jeff Morgan f5b784491c 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
Jeff Morgan bdf0949190 Initial commit 2014-08-27 13:45:22 -07:00