Merge 2.6 into main - #888
Merged
Merged
Conversation
Add documentation for NI Traktor MX2 mapping
…upport_to_2.6 Backport markdown support to 2.6
Macos app sandbox
…-manual-to-markdown Migrating hardware manual to Markdown (first batch)
Member
|
Is there anything we should check manually here, like were there any conflicts to resolve? |
Member
Author
|
There were no conflicts |
Member
|
Well, then 🤷♂️ |
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
7 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.
This contains the file format change from RST to MarkDown and should be merged soon to prevent conflicts.