diff options
| author | k8s-ci-robot <k8s-ci-robot@users.noreply.github.com> | 2018-05-14 10:03:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-14 10:03:27 -0700 |
| commit | dd2f4cc060c015abbdfff03a6d5f14be4c3305ce (patch) | |
| tree | c8b2c381194b4b6a05074570107b4ffea3a5a34b | |
| parent | 643702eb4b4059bfcd5d133cc9f7e4761a4c1992 (diff) | |
| parent | 8ccff61002d626411e61b541352f2237f1c149a0 (diff) | |
Merge pull request #2136 from gerl1ng/EventChina
Add China to the list of events
| -rw-r--r-- | contributors/guide/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contributors/guide/README.md b/contributors/guide/README.md index ddb65111..ad5cf2e1 100644 --- a/contributors/guide/README.md +++ b/contributors/guide/README.md @@ -208,7 +208,7 @@ If you haven't noticed by now, we have a large, lively, and friendly open-source ## Events -Kubernetes is the main focus of CloudNativeCon/KubeCon, held twice per year in EMEA and in North America. Information about these and other community events is available on the CNCF [events](https://www.cncf.io/events/) pages. +Kubernetes is the main focus of KubeCon + CloudNativeCon, held three times per year in China, Europe and in North America. Information about these and other community events is available on the CNCF [events](https://www.cncf.io/events/) pages. ### Meetups |