Commit Graph

1 Commits

Author SHA1 Message Date
Jeff Morgan 000d916693 Merge branch 'backend-refactor' of github.com:kitematic/kitematic into installer_fix
Conflicts:
	meteor/client/lib/docker.js
	meteor/client/lib/validations.js
	meteor/client/lib/virtualbox.js
	meteor/lib/validations.js
	meteor/server/apps.js
	meteor/server/lib/validations.js
2014-09-04 02:39:13 -07:00