Merge back 10.12.0 #40682
Merged
Merge back 10.12.0 #40682
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is mainly for streams that don't wrap another one, or use a stream not provided by the native fopen function such as smbclient_open
Signed-off-by: Michiel de Jong <[email protected]>
Signed-off-by: Michiel de Jong <[email protected]>
Signed-off-by: Michiel de Jong <[email protected]>
Signed-off-by: Michiel de Jong <[email protected]>
Revert .htaccess change
Upgrading phpseclib/phpseclib (3.0.18 => 3.0.19)
Ocm via sciencemesh for 10.12
revert logic to expose free_space, but keep availableStorage config
* [tx] updated from transifex * [tx] updated from transifex * make getFrom configurable * fix style * Adjust unit tests for MailNotificationsTest * add changelog * Document remove_sender_display_name system setting * Add unit test cases for when remove_sender_display_name is set to true --------- Co-authored-by: ownClouders <[email protected]> Co-authored-by: Phil Davis <[email protected]>
removing double to
|
Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes. |
|
Kudos, SonarCloud Quality Gate passed! |
jnweiger
approved these changes
Mar 13, 2023
Contributor
jnweiger
left a comment
jnweiger
left a comment
There was a problem hiding this comment.
Thanks for the PR.
This is next on my checklist :-)
Do we want to keep the release-10.12.0 branch around?
Contributor
Author
It won't hurt for now. But I suppose that if we need to make 10.12.1 then we would create that branch from the 10.12.0 release tag or... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
I made a separate branch name from the current
release-10.12.0branch to do this merge-back. When PRs are merged, GitHub automagically deletes the PR branch, and I don't really want the "real"release-10.12.0branch to accidentally get deleted.How Has This Been Tested?
CI
Types of changes
Checklist: