docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:kitematic/kitematic into jmorgan_react_refactor 

Conflicts:
	meteor/client/lib/apputil.js
	meteor/client/lib/docker.js
	meteor/client/lib/imageutil.js
	meteor/client/lib/metrics.js
	meteor/client/lib/startup.js
	meteor/client/lib/util.js
	meteor/client/main.js
This commit is contained in:
Jeffrey Morgan 2015-01-12 09:36:50 -05:00
parent f7087e4e6b ad8cfbe5a1
commit 4c3d3ad08b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Kitematic", "name": "Kitematic",
"version": "0.4.3", "version": "0.4.4",
"author": "Kitematic", "author": "Kitematic",
"description": "Simple Docker App management for Mac OS X.", "description": "Simple Docker App management for Mac OS X.",
"homepage": "https://kitematic.com/", "homepage": "https://kitematic.com/",