Commit Graph

2 Commits

Author SHA1 Message Date
Jeff Morgan 0357ce7b0e Fixing outstanding installer & port mapping bugs 2014-11-28 17:56:38 -05:00
Jeff Morgan effef0c2e6 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