+
Skip to content

[UPMERGE] 3.2 -> 4.0 #2878

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

Merged
merged 4 commits into from
Jul 9, 2025
Merged

[UPMERGE] 3.2 -> 4.0 #2878

merged 4 commits into from
Jul 9, 2025

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Jul 9, 2025

This PR has been generated automatically.

Remember! The upmerge should always be merged with using Merge pull request button.

In case of conflicts, please resolve them manually with usign the following commands:

git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/4.0 -m "Resolve conflicts between 3.2 and 4.0"

Copy link

sonarqubecloud bot commented Jul 9, 2025

@dpfaffenbauer dpfaffenbauer merged commit fccda03 into 4.0 Jul 9, 2025
220 of 229 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Jul 9, 2025
@github-actions github-actions bot deleted the upmerge/3.2_4.0 branch July 10, 2025 03:24
@github-actions github-actions bot restored the upmerge/3.2_4.0 branch July 11, 2025 03:39
@github-actions github-actions bot deleted the upmerge/3.2_4.0 branch July 12, 2025 03:35
@github-actions github-actions bot restored the upmerge/3.2_4.0 branch July 13, 2025 03:42
@github-actions github-actions bot deleted the upmerge/3.2_4.0 branch July 14, 2025 03:43
@github-actions github-actions bot restored the upmerge/3.2_4.0 branch July 15, 2025 03:40
@github-actions github-actions bot deleted the upmerge/3.2_4.0 branch July 16, 2025 03:38
@github-actions github-actions bot restored the upmerge/3.2_4.0 branch July 17, 2025 03:38
@github-actions github-actions bot deleted the upmerge/3.2_4.0 branch July 18, 2025 03:41
@github-actions github-actions bot restored the upmerge/3.2_4.0 branch July 19, 2025 03:25
@github-actions github-actions bot deleted the upmerge/3.2_4.0 branch July 20, 2025 03:48
@github-actions github-actions bot restored the upmerge/3.2_4.0 branch July 21, 2025 03:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载