[servicecomb-website] 01/04: Merge branch 'master' into asf-site

[ningjiang]

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 f646d3f00cf0c10adb880cc7f9d20804da2da0d5
Merge: f23681b c860e43
Author: Willem Jiang 
AuthorDate: Thu Nov 7 10:12:44 2019 +0800

Merge branch 'master' into asf-site

 _pages/home.md   |  3 +++
 ...cecomb-accept-newcapec-institute-code-donation.md | 20 
 2 files changed, 23 insertions(+)

[servicecomb-website] 01/04: Merge branch 'master' into asf-site

[ningjiang]

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 26ae3ae2afa2b0e6f033d2776c282384b3774f52
Merge: 4224efc fc80a5b
Author: Willem Jiang 
AuthorDate: Wed Aug 28 19:13:38 2019 +0800

Merge branch 'master' into asf-site

 _release/cn/java_chassis_downloads.md   | 2 +-
 _release/cn/pack_downloads.md   | 4 ++--
 _release/cn/service_center_downloads.md | 2 +-
 _release/java_chassis_downloads.md  | 2 +-
 _release/pack_downloads.md  | 4 ++--
 _release/service_center_downloads.md| 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

[incubator-servicecomb-website] 01/04: Merge branch 'master' into asf-site

[ningjiang]

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 b0c8c63a86bf892149be1b48279a89c068e37136
Merge: cf9cc34 70886d6
Author: Willem Jiang 
AuthorDate: Sun Oct 21 15:26:33 2018 +0800

Merge branch 'master' into asf-site

 _config.yml |   6 ++--
 _data/authors.yml   |   4 +--
 _includes/footer/custom.html|   8 +
 _pages/cn/home.md   |   4 +--
 _pages/home.md  |   6 ++--
 _posts/2018-10-15-OSI-Workshop-Report.md|  44 
 _posts/cn/2018-10-15-OSI-Workshop-Report.md |  44 
 assets/images/OSI/OSI-Event-Glimpse.jpg | Bin 0 -> 2102817 bytes
 assets/images/OSI/OSI-Tracks.png| Bin 0 -> 165029 bytes
 assets/images/OSI/OSI-Workshop-1.jpg| Bin 0 -> 1284915 bytes
 assets/images/OSI/OSI-Workshop-2.jpg| Bin 0 -> 1601481 bytes
 assets/images/OSI/OSI-Workshop-3.jpg| Bin 0 -> 1402878 bytes
 assets/images/OSI/OSI-Workshop-4.jpg| Bin 0 -> 1233627 bytes
 assets/images/OSI/Patners.png   | Bin 0 -> 116394 bytes
 assets/images/OSI/Speakers.jpg  | Bin 0 -> 2886295 bytes
 assets/images/OSI/Title.png | Bin 0 -> 178472 bytes
 assets/images/OSI/Topics.png| Bin 0 -> 40781 bytes
 17 files changed, 99 insertions(+), 17 deletions(-)

[incubator-servicecomb-website] 01/04: Merge branch 'master' into asf-site

[ningjiang]

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 3b4a1948b897c4651d4e7d6e032740e0456064ad
Merge: e79d3bc be3d6ce
Author: Willem Jiang 
AuthorDate: Thu Mar 29 13:43:21 2018 +0800

Merge branch 'master' into asf-site

 _pages/cn/home.md | 4 ++--
 _pages/home.md| 9 +++--
 2 files changed, 5 insertions(+), 8 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.