1
0
mirror of https://github.com/docker/docs.git synced 2026-10-31 10:34:26 +03:00
Commit Graph

5 Commits

Author SHA1 Message Date
Jeffrey Morgan
d52810959a Fixing merges 2015-02-26 20:16:48 -05:00
Jeffrey Morgan
75467305df Merge branch 'master' into machine
Conflicts:
	util/deps
2015-02-26 20:15:01 -05:00
Jeffrey Morgan
b5bd6803d6 Working version of machine 2015-02-26 20:14:43 -05:00
Jeffrey Morgan
25302cc1a9 Merge branch 'master' into machine
Conflicts:
util/deps
2015-02-26 16:18:26 -05:00
Jeffrey Morgan
e3d9de2d70 Clean test files, binaries 2015-02-26 13:58:30 -05:00