Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented May 15, 2020

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #20941

Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 icewind1991 force-pushed the backport/20941/stable18 branch from 78e9be2 to 5d38e80 Compare May 15, 2020 15:21
@icewind1991
Copy link
Member

resolved the conflict

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

🐘

@MorrisJobke MorrisJobke merged commit 9033d57 into stable18 May 18, 2020
@MorrisJobke MorrisJobke deleted the backport/20941/stable18 branch May 18, 2020 09:03
@rullzer rullzer mentioned this pull request May 21, 2020
5 tasks
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.

4 participants