Skip to content

Conversation

@backportbot-nextcloud
Copy link

backport of #28118

@backportbot-nextcloud backportbot-nextcloud bot added enhancement feature: occ pending documentation This pull request needs an associated documentation update labels Sep 15, 2021
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 22.1.2 milestone Sep 15, 2021
@PVince81 PVince81 self-assigned this Sep 15, 2021
@PVince81
Copy link
Member

strange that the DCO bot accepted the mixed Author+Signed off by in the original PR but not this one

PVince81 and others added 2 commits September 15, 2021 12:18
- new option --transfer-incoming-shares=1 | 0
- new config.php option 'transfer-incoming-shares' => true | false

The command line option overrules the config.php option.

Signed-off-by: Vincent Petry <[email protected]>
Co-authored-by: Immanuel Pasanec <[email protected]>
@PVince81 PVince81 force-pushed the backport/28118/stable22 branch from 8c2542c to 42239fc Compare September 15, 2021 10:19
@PVince81
Copy link
Member

to fix the DCO issue I made myself main author of the first commit and added Immanuel as Co-Author.

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.

👍

@PVince81 PVince81 added the 3. to review Waiting for reviews label Sep 15, 2021
@PVince81 PVince81 requested a review from skjnldsv September 15, 2021 13:29
@PVince81 PVince81 merged commit 4d5ee24 into stable22 Sep 15, 2021
@PVince81 PVince81 deleted the backport/28118/stable22 branch September 15, 2021 14:56
@blizzz blizzz mentioned this pull request Sep 23, 2021
4 tasks
@MichaIng MichaIng modified the milestones: Nextcloud 22.1.2, Nextcloud 22.2.0 Sep 24, 2021
@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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants