Savitha Raghunathan 7ddedb00a0 resolving conflicts

2020-06-17 17:11:24 -04:00

..

_common-resources

…

blog

Merge pull request #20633 from gaoguangze111/Translation-Appc-Support-For-Kubernetes-Through-Rkt

2020-06-01 07:11:55 -07:00

case-studies

Fix Left panel navigating bar layout issue for zh (#19517)

2020-04-26 15:30:36 +08:00

community

…

docs

resolving conflicts

2020-06-17 17:11:24 -04:00

examples

beta.kubernetes.io/os deprecated since v1.14, are targeted for removal in v1.18

2020-05-07 11:58:40 +08:00

includes

deleting migration-notice that conflicts with upgrading hugo

2020-04-26 15:41:49 +08:00

partners

update partners page in zh document

2020-04-30 15:14:39 +08:00

training

Add Training pages for language zh

2020-04-30 12:50:38 +08:00

_index.html

…

OWNERS

…