centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-27 14:28:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sean-polish

Browse Source 
Conflicts:
	src/NewContainer.react.js
	src/Setup.react.js
	src/SetupStore.js
This commit is contained in:
Sean Li
2015-02-16 13:42:23 -08:00
parent ed1c58c828 f6d14a444a
commit 4061544976
24 changed files with 530 additions and 910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -38,8 +38,8 @@
"node_modules/6to5"
]
},
"docker-version": "1.4.1",
"boot2docker-version": "1.4.1",
"docker-version": "1.5.0",
"boot2docker-version": "1.5.0",
"atom-shell-version": "0.21.1",
"virtualbox-version": "4.3.20",
"virtualbox-filename": "VirtualBox-4.3.20.pkg",