p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f8785b170408117cf016a71e29bf609042a8b5f2
docker-cli/components
History
Casey Bisson f8785b1704 Merge branch 'master' of github.com:docker/docker into joyentinstall 
Resolved conflict in the following file:
	docs/sources/installation/MAINTAINERS

File was deleted upstream and changed in this branch. Deleting the file in this branch as well.

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: cb2280c98e3a2aa389b64adcafb30a446e2b6d24
Component: engine
2015-03-20 14:37:17 -07:00
..
engine
Merge branch 'master' of github.com:docker/docker into joyentinstall
2015-03-20 14:37:17 -07:00