Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/2023.x' into heyoulin
Browse files Browse the repository at this point in the history
  • Loading branch information
spnettec committed Apr 6, 2024
2 parents ae6e4f4 + cd07571 commit d196e7c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Spring Cloud Alibaba 致力于提供微服务开发的一站式解决方案。

参考文档 请查看 [WIKI](https://github.com/alibaba/spring-cloud-alibaba/wiki)

为 Spring Cloud Alibaba 贡献代码请参考 [如何贡献](https://github.com/alibaba/spring-cloud-alibaba/wiki/%E5%A6%82%E4%BD%95%E8%B4%A1%E7%8C%AE%E4%BB%A3%E7%A0%81)
为 Spring Cloud Alibaba 贡献代码请参考 [如何贡献](https://sca.aliyun.com/zh-cn/community/developer/contributor-guide/new-contributor-guide_dev/)

## 主要功能

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ As the interfaces and annotations of Spring Boot 1 and Spring Boot 2 have been c
* 2023.x for Spring Boot 3.2.x

## Code of Conduct
This project is a sub-project of Spring Cloud, it adheres to the Contributor Covenant [code of conduct](https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
This project is a sub-project of Spring Cloud, it adheres to the Contributor Covenant [code of conduct](https://sca.aliyun.com/en-us/community/developer/contributor-guide/new-contributor-guide_dev/). By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.

## Code Conventions and Housekeeping
None of these is essential for a pull request, but they will all help. They can also be added after the original pull request but before a merge.
Expand Down

0 comments on commit d196e7c

Please sign in to comment.