This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch asf-site
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git
commit 096e0c036fbf0782d71620414c9257b01f822786
Merge: 20a71a4 afff1db
Author: Willem Jiang <jiangni...@huawei.com>
AuthorDate: Sun Sep 30 01:15:56 2018 -0700
Merge branch 'master' into asf-site
_pages/cn/home.md | 2 +-
_pages/home.md | 2 +-
...9-28-Apache-ServiceComb-Meetup-2018-Shanghai.md | 88 ++++++++++++++++++++++
...-28-Apache-ServiceComb-Meetup-2018-Shanghai.md} | 16 ++--
4 files changed, 98 insertions(+), 10 deletions(-)
