Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Jan 7, 2022

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #30515

@backportbot-nextcloud backportbot-nextcloud bot added the pending documentation This pull request needs an associated documentation update label Jan 7, 2022
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 21.0.8 milestone Jan 7, 2022
@MichaIng
Copy link
Member

MichaIng commented Jan 7, 2022

Documentantion change: nextcloud/documentation#7866

Copy link
Member

@MichaIng MichaIng left a comment

Choose a reason for hiding this comment

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

Resolving conflicts.
EDIT: Done

Test fails due to outstanding Psalm baseline update.

which is not used anymore since: #29470

Signed-off-by: MichaIng <[email protected]>
@MichaIng MichaIng force-pushed the backport/30515/stable21 branch from fc8eadf to 768bf3c Compare January 7, 2022 09:19
@blizzz blizzz changed the title [stable21] [stable22] Remove iconv from dependencies and tests [stable21] Remove iconv from dependencies and tests Jan 7, 2022
@MichaIng MichaIng merged commit 5eb791a into stable21 Jan 7, 2022
@MichaIng MichaIng deleted the backport/30515/stable21 branch January 7, 2022 11:25
This was referenced Jan 20, 2022
@nickvergessen nickvergessen removed the pending documentation This pull request needs an associated documentation update label Nov 8, 2022
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