7 Commits

Author	SHA1	Message	Date
Brett Randall	58beec2d76	Included httpsProxy key/value in sample client config.json. ... Signed-off-by: Brett Randall <javabrett@gmail.com>	2019-01-06 16:47:54 +11:00
Maria Bermudez	aaca9b83b5	Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"" ... This reverts commit 4c95d161ca.	2018-08-29 19:01:03 -07:00
Maria Bermudez	4c95d161ca	Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2" ... This reverts commit af5f2fcc38, reversing changes made to 338b690d26.	2018-08-29 18:37:44 -07:00
Maria Bermudez	840c167055	Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"" ... This reverts commit 14080c18bd.	2018-08-29 18:36:03 -07:00
Maria Bermudez	14080c18bd	Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2" ... This reverts commit af5f2fcc38, reversing changes made to 338b690d26.	2018-08-29 14:47:31 -07:00
pallxk	35cd70f4f1	Fix typo in proxy.md	2018-05-16 15:48:29 -07:00
Misty Stanley-Jones	9c56ec4596	Put back proxy server content (#5951)	2018-02-07 16:16:45 -08:00