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/servicecomb-website.git
commit fe789f8da06c87c10e2a5cf9ef963fadfbb15b52
Merge: eab31f2 e162914
Author: Willem Jiang <willem.ji...@gmail.com>
AuthorDate: Thu May 28 20:47:44 2020 +0800
Merged the master branch
.gitignore | 2 ++
_pages/cn/summer2020.html | 10 ------
_pages/cn/summer2020.md | 39 +++++++++++++++++++++
_pages/home.md | 2 +-
assets/images/summer2020/summer2020_detail.png | Bin 0 -> 59001 bytes
.../images/summer2020/summer2020_introduction.png | Bin 0 -> 485781 bytes
6 files changed, 42 insertions(+), 11 deletions(-)
diff --cc .gitignore
index 655583d,0901c87..5998938
--- a/.gitignore
+++ b/.gitignore
@@@ -2,3 -2,6 +2,5 @@@
.DS_Store
Gemfile.lock
_site
-content
+ .ruby-gemset
+ .ruby-version
