Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable25] Fix app menu flicker #38565

Merged
merged 1 commit into from Aug 2, 2023
Merged

[stable25] Fix app menu flicker #38565

merged 1 commit into from Aug 2, 2023

Conversation

backportbot-nextcloud[bot]
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
@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 /

@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 /

@szaimen
Copy link
Contributor

szaimen commented Jul 10, 2023

/compile amend /

@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
Copy link
Contributor

szaimen commented Jul 13, 2023

/compile amend /

Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@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
28 of 31 checks passed
@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.

None yet

4 participants