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

gongchao pushed a commit to branch update-monitor-list
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git

commit ee2fcda0ad715f357d7c600e07cc52453e213513
Merge: 7dddc0b2ac a2c1123b09
Author: tomsun28 <[email protected]>
AuthorDate: Mon Mar 31 15:47:32 2025 +0800

    Merge branch 'master' into update-monitor-list
    
    # Conflicts:
    #       web-app/src/app/routes/monitor/monitor.module.ts

 home/i18n/en/docusaurus-theme-classic/footer.json    | 2 +-
 home/i18n/zh-cn/docusaurus-theme-classic/footer.json | 2 +-
 home/src/pages/team/member.json                      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to