[Conflicts] Merge main into next #3125
Open
+1,021
−32
Conversation
This file contains 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
…2660) Co-authored-by: Johannes Obermair <48853629+johnnyomair@users.noreply.github.com>
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
9fddd63 to
279e52e
Compare
|
vivid-planet-bot
changed the title
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
279e52e to
dc373bb
Compare
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
dc373bb to
39598f7
Compare
Co-authored-by: Johannes Obermair <48853629+johnnyomair@users.noreply.github.com>
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
39598f7 to
956c0d3
Compare
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
956c0d3 to
a10c685
Compare
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
a10c685 to
2e197de
Compare
…2229) Co-authored-by: Johannes Obermair <48853629+johnnyomair@users.noreply.github.com> Co-authored-by: Daniel Karnutsch <dkarnutsch@users.noreply.github.com>
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
2e197de to
d959ace
Compare
… and column-visibility states (#2574) Co-authored-by: Markus Fichtner <markus.fichtner@vivid-planet.com>
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
d959ace to
c81e495
Compare
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
c81e495 to
d545ee9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an automated pull request to merge changes from
mainintonext. It has merge conflicts. To resolve conflicts, check out the branchmerge-main-into-nextlocally, make any necessary changes to conflicting files, and commit and publish your changes.