Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolve master and develop conflict #1122

Merged
merged 1 commit into from
Jun 16, 2022
Merged

resolve master and develop conflict #1122

merged 1 commit into from
Jun 16, 2022

Conversation

taotao7
Copy link
Contributor

@taotao7 taotao7 commented Jun 16, 2022

No description provided.

@taotao7 taotao7 changed the base branch from master to develop June 16, 2022 07:27
@taotao7 taotao7 changed the title Xt/chore/conflict resolve master and develop conflict Jun 16, 2022
@PeterRao PeterRao merged commit fb21240 into develop Jun 16, 2022
PeterRao added a commit that referenced this pull request Sep 4, 2023
* chore: adjust download  request hints (#1061)

* chore: adjust download hints

* chore: adjust download hints

* chore: some optimized (#1062)

- add head method warning
- adjust PR githubCi

* chore(develop): remove cleanbucket workflow (#1094)

* feat(develop): ios dingding add default content-type (#1070)

* feat(develop): ios dingding add default content-type

* feat(develop): ios dingding add default content-type

* feat(develop): ios dingding add default content-type

* feat(develop): ios dingding add default content-type

* feat(develop): ios dingding add default content-type

* feat(develop): ios dingding add default content-type

* chore: remove remove redundant judgments

* resolve master and develop conflict (#1122)

Co-authored-by: xt01102058 <xt01102058@alibaba-inc.com>

* resolve master and develop conflict

* chore: marge develop to master

* test: fix test ConnectionTimeoutError bug

* chore: add put() timeout unit

* chore: optimize the translation of readme.md ResponseTimeoutError

---------

Co-authored-by: moca_tao7 <moca_tao7@foxmail.com>
Co-authored-by: xt01102058 <xt01102058@alibaba-inc.com>
Co-authored-by: PeterRao <peizerao@gmail.com>
Co-authored-by: csg01123119 <csg01123119@alibaba-inc.com>
@YunZZY YunZZY deleted the xt/chore/conflict branch August 7, 2024 07:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants