Maria Bermudez 5a17e3c932 Fix merge conflicts		2019-05-20 12:21:29 -07:00
..
admin	Sync published with master (#8778)	2019-05-07 18:17:46 -07:00
images	Revert "Revert "Merge branch 'master' of github.com:docker/docker.github.io""	2019-03-08 10:53:00 -08:00
user	Sync published with master (#8673)	2019-04-19 02:21:08 +02:00
architecture.md	Revert template tags in DTR topics (#598)	2018-04-16 13:31:24 -07:00
deprecation-notice.md	Update deprecation-notice.md	2019-02-01 16:26:52 -08:00
index.md	Incremental fixes to DTR index pages for 2.5 and 2.6	2018-11-14 13:28:07 -08:00
release-notes.md	Fix merge conflicts	2019-05-20 12:21:29 -07:00