nextcloud / server

☁️ Nextcloud server, a safe home for all your data
https://nextcloud.com
GNU Affero General Public License v3.0
27.42k stars 4.07k forks source link

[stable30] feat: mail provider settings #49254

Open backportbot[bot] opened 1 day ago

backportbot[bot] commented 1 day ago

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.

kesselb commented 6 hours ago

Hi,

This is my usual approach for handling backports with conflicts:

gh pr checkout 49254 -f git reset --hard HEAD~2 git clean -i git cherry-pick 3e870695bc4989e5e2c6f59c44ed5dbd501a7673

and then resolve the conflicts one by one.

There was a lot of automated refactoring/reformatting meanwhile :see_no_evil:

SebastianKrupinski commented 5 hours ago

@kesselb Thank you, I was going to work on this today.