[stable31] fix(ui): style conflict resolution buttons#6972
Merged
max-nextcloud merged 5 commits intostable31from Mar 20, 2025
Merged
[stable31] fix(ui): style conflict resolution buttons#6972max-nextcloud merged 5 commits intostable31from
max-nextcloud merged 5 commits intostable31from
Conversation
backportbot
bot
added
design
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## stable31 #6972 +/- ##
=========================================
Coverage 47.31% 47.32%
=========================================
Files 750 742 -8
Lines 34753 34736 -17
Branches 1284 1275 -9
=========================================
- Hits 16444 16439 -5
+ Misses 17690 17686 -4
+ Partials 619 611 -8 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
juliusknorr
force-pushed
the
backport/6964/stable31
branch
from
08c305e to
d6076cd
Compare
Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: Marco Ambrosini <marcoambrosini@Mac.home>
Signed-off-by: Marco Ambrosini <marcoambrosini@Mac.home>
Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: Max <max@nextcloud.com>
juliusknorr
force-pushed
the
backport/6964/stable31
branch
from
d6076cd to
ab64e00
Compare
juliusknorr
approved these changes
Mar 20, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of PR #6964