You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@answer.apache.org by fe...@apache.org on 2023/11/13 03:14:41 UTC

(incubator-answer-website) 04/04: Merge branch 'main' of github.com:apache/incubator-answer-website into fix-roadmap

This is an automated email from the ASF dual-hosted git repository.

fenbox pushed a commit to branch fix-roadmap
in repository https://gitbox.apache.org/repos/asf/incubator-answer-website.git

commit adb67dc95ba18479b7862ef2e78ff8121cbb5a26
Merge: ff03409f e842623e
Author: fen <f3...@gmail.com>
AuthorDate: Mon Nov 13 11:13:22 2023 +0800

    Merge branch 'main' of github.com:apache/incubator-answer-website into fix-roadmap
    
    # Conflicts:
    #       docusaurus.config.js

 .../index.md                                       |  2 +-
 docusaurus.config.js                               |  4 +-
 i18n/zh-CN/code.json                               | 17 +++++-
 .../index.md                                       |  2 +-
 i18n/zh-CN/docusaurus-theme-classic/navbar.json    |  4 ++
 src/components/HeaderSlogan/index.tsx              |  4 ++
 src/pages/contact.tsx                              | 16 ++----
 src/pages/plugins.tsx                              | 62 ++++++++++++++++++++++
 8 files changed, 93 insertions(+), 18 deletions(-)