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 <[email protected]> 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(-)
