Skip to content

Commit

Permalink
Merge pull request kubernetes#2136 from gerl1ng/EventChina
Browse files Browse the repository at this point in the history
Add China to the list of events
  • Loading branch information
k8s-ci-robot authored May 14, 2018
2 parents 643702e + 8ccff61 commit dd2f4cc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contributors/guide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit dd2f4cc

Please sign in to comment.