Skip to content

[stable27] Fix app menu flicker - #38563

Merged
blizzz merged 1 commit into
stable27from
backport/38549/stable27
Aug 3, 2023
Merged

[stable27] Fix app menu flicker#38563
blizzz merged 1 commit into
stable27from
backport/38549/stable27

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

@szaimen

Copy link
Copy Markdown
Contributor

/compile amend /

@szaimenszaimen added the 3. to review Waiting for reviews label May 31, 2023
@szaimen
szaimen marked this pull request as ready for review May 31, 2023 19:39
@skjnldsvskjnldsv mentioned this pull request Jun 8, 2023
22 tasks
@skjnldsv
skjnldsvforce-pushed the backport/38549/stable27 branch from 634d5e7 to cbafe75CompareJune 9, 2023 09:14
@blizzzblizzz mentioned this pull request Jun 12, 2023
@blizzzblizzz mentioned this pull request Jul 10, 2023
@blizzz

Copy link
Copy Markdown
Member

/compile amend /

@blizzz

Copy link
Copy Markdown
Member

still conflicts :-/

@blizzz

Copy link
Copy Markdown
Member

moving to 27.0.2

@blizzzblizzz mentioned this pull request Aug 2, 2023
@blizzz

Copy link
Copy Markdown
Member

conflicts @ZetaTom@szaimen

@mejo-
mejo-force-pushed the backport/38549/stable27 branch from 4492970 to 26884aaCompareAugust 3, 2023 09:49
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
mejo-force-pushed the backport/38549/stable27 branch from 26884aa to bd28a0aCompareAugust 3, 2023 09:50
@mejo-

mejo- commented Aug 3, 2023

Copy link
Copy Markdown
Member

Psalm failure unrelated, same failure already on stable27 branch - and the PR has no changes in PHP code anyway.

@blizzz
blizzz merged commit 7307211 into stable27Aug 3, 2023
@blizzz
blizzz deleted the backport/38549/stable27 branch August 3, 2023 10:54
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@szaimen@blizzz@mejo-@Pytal@ZetaTom@skjnldsv