Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented May 31, 2023

  • ⚠️ This backport had conflicts that were resolved with the 'ours' merge strategy and is likely incomplete

backport of #38549

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 25.0.8 milestone May 31, 2023
@szaimen szaimen added the 3. to review Waiting for reviews label May 31, 2023
@szaimen
Copy link
Contributor

szaimen commented May 31, 2023

/compile amend /

@szaimen szaimen marked this pull request as ready for review May 31, 2023 19:41
@nextcloud-command nextcloud-command force-pushed the backport/38549/stable25 branch from 244b78d to b6124f2 Compare May 31, 2023 19:50
@blizzz blizzz mentioned this pull request Jun 12, 2023
@szaimen
Copy link
Contributor

szaimen commented Jun 12, 2023

Conflicts

@szaimen szaimen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 12, 2023
@blizzz
Copy link
Member

blizzz commented Jun 14, 2023

/compile amend /

@nextcloud-command nextcloud-command force-pushed the backport/38549/stable25 branch from b6124f2 to 45c2f1b Compare June 14, 2023 21:07
@blizzz
Copy link
Member

blizzz commented Jun 15, 2023

Still conflicts, moving to 25.0.9

@blizzz blizzz mentioned this pull request Jul 10, 2023
@blizzz
Copy link
Member

blizzz commented Jul 10, 2023

/compile amend /

@blizzz blizzz enabled auto-merge July 10, 2023 15:17
@szaimen szaimen force-pushed the backport/38549/stable25 branch from 45c2f1b to 0442417 Compare July 10, 2023 15:22
@szaimen
Copy link
Contributor

szaimen commented Jul 10, 2023

/compile amend /

@nextcloud-command nextcloud-command force-pushed the backport/38549/stable25 branch from 0442417 to e126d58 Compare July 10, 2023 15:41
@blizzz
Copy link
Member

blizzz commented Jul 11, 2023

still conflicts :/

@blizzz
Copy link
Member

blizzz commented Jul 13, 2023

moving to 25.0.10

@szaimen szaimen force-pushed the backport/38549/stable25 branch from e126d58 to 4eab1b0 Compare July 13, 2023 11:48
@szaimen
Copy link
Contributor

szaimen commented Jul 13, 2023

/compile amend /

Signed-off-by: ZetaTom <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
@nextcloud-command nextcloud-command force-pushed the backport/38549/stable25 branch from 4eab1b0 to 1bf0bc6 Compare July 13, 2023 12:50
@blizzz blizzz mentioned this pull request Aug 2, 2023
@blizzz blizzz disabled auto-merge August 2, 2023 19:25
@blizzz blizzz merged commit 46a8c11 into stable25 Aug 2, 2023
@blizzz blizzz deleted the backport/38549/stable25 branch August 2, 2023 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2. developing Work in progress bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants