Skip to content

[stable25] Fix app menu flicker - #38565

Merged
blizzz merged 1 commit into
stable25from
backport/38549/stable25
Aug 2, 2023
Merged

[stable25] Fix app menu flicker#38565
blizzz merged 1 commit into
stable25from
backport/38549/stable25

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented May 31, 2023

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

backport of #38549

@backportbot-nextcloudbackportbot-nextcloudBot added this to the Nextcloud 25.0.8 milestone May 31, 2023
@szaimenszaimen added the 3. to review Waiting for reviews label May 31, 2023
@szaimen

Copy link
Copy Markdown
Contributor

/compile amend /

@szaimen
szaimen marked this pull request as ready for review May 31, 2023 19:41
@blizzzblizzz mentioned this pull request Jun 12, 2023
@szaimen

Copy link
Copy Markdown
Contributor

Conflicts

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

Copy link
Copy Markdown
Member

/compile amend /

@blizzz

Copy link
Copy Markdown
Member

Still conflicts, moving to 25.0.9

@blizzzblizzz mentioned this pull request Jul 10, 2023
@blizzz

Copy link
Copy Markdown
Member

/compile amend /

@blizzz
blizzz enabled auto-merge July 10, 2023 15:17
@szaimen
szaimenforce-pushed the backport/38549/stable25 branch from 45c2f1b to 0442417CompareJuly 10, 2023 15:22
@szaimen

Copy link
Copy Markdown
Contributor

/compile amend /

@blizzz

Copy link
Copy Markdown
Member

still conflicts :/

@blizzz

Copy link
Copy Markdown
Member

moving to 25.0.10

@szaimen

Copy link
Copy Markdown
Contributor

/compile amend /

Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@blizzzblizzz mentioned this pull request Aug 2, 2023
@blizzz
blizzz disabled auto-merge August 2, 2023 19:25
@blizzz
blizzz merged commit 46a8c11 into stable25Aug 2, 2023
@blizzz
blizzz deleted the backport/38549/stable25 branch August 2, 2023 19:25
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2. developingWork in progressbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@szaimen@blizzz@Pytal@ZetaTom