Guillaume J. Charmes d233a440c6 Merge branch 'master' into remove_bsdtar ...

Conflicts:
	docs/sources/contributing/devenvironment.rst
Upstream-commit: abf85b25085b52e19f774dc30bd87527b3295f2a
Component: engine

2013-06-14 14:34:30 -07:00

..

contributing.rst

Fixed some links

2013-06-05 18:06:51 -07:00

devenvironment.rst

Merge branch 'master' into remove_bsdtar

2013-06-14 14:34:30 -07:00

index.rst

Made changes to incorporate extermal docs.docker.io. Also took out /documentation/ dir so sources are easier accessible and the folder is not redundant on docs.docker.io/documentation/

2013-03-27 16:43:13 -07:00