Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Dec 13, 2022

  • ⚠️ This backport had conflicts and is incomplete

backport of #31696

Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 but conflicts

@mejo- mejo- force-pushed the backport/31696/stable22 branch from 30db3e0 to 1578120 Compare December 14, 2022 09:54
@mejo-
Copy link
Member

mejo- commented Dec 14, 2022

I resolved the conflicts and backported the missing code parts manually.

Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good

Copy link
Member

@danxuliu danxuliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflict resolution looks good 👍 (I can not judge the code, though)

@come-nc come-nc merged commit dfc6cf1 into stable22 Dec 20, 2022
@come-nc come-nc deleted the backport/31696/stable22 branch December 20, 2022 09:56
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.

6 participants