[stable30] feat: mail provider settings #49254
Merged
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
backportbot
bot
requested review from
SebastianKrupinski,
kesselb and
marcoambrosini
SebastianKrupinski
requested review from
miaulalala and
st3iny
as code owners
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| return; | ||
| } | ||
|
|
||
| if ($event instanceof DeclarativeSettingsSetValueEvent) { |
Check notice
Code scanning / Psalm
RedundantConditionGivenDocblockType Note
kesselb
added
2. developing
Contributor
|
Hi, This is my usual approach for handling backports with conflicts:
and then resolve the conflicts one by one. There was a lot of automated refactoring/reformatting meanwhile 🙈 |
Contributor
|
@kesselb Thank you, I was going to work on this today. |
Signed-off-by: SebastianKrupinski <[email protected]>
SebastianKrupinski
force-pushed
the
backport/48134/stable30
branch
from
2b86eed to
1260ec5
Compare
SebastianKrupinski
approved these changes
Nov 15, 2024
st3iny
approved these changes
Nov 15, 2024
st3iny
added
4. to release
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.
Backport of #48134
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.