Merge rc/3.4 into main
#7739
Merged
Merge rc/3.4 into main
#7739
Conversation
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
Update version numbers in CodeQL support notes for LGTM 1.29
Release preparation for version 2.7.6
Port changes from main to rc/3.3 to avoid regression
Conflicts in *-support.rst resolved in favour of rc/3.3, which has a new paragraph. Enterprise version numbers updated to LGTM Enterprise 1.30 and CodeQL 2.7.6.
Merge rc/3.3 into rc/3.4
Post-release preparation for codeql-cli-2.7.6
aeisenberg
requested changes
Jan 25, 2022
csharp/ql/campaigns/Solorigate/lib/change-notes/released/0.0.7.md
Outdated
Show resolved
Hide resolved
csharp/ql/campaigns/Solorigate/test/change-notes/released/0.0.8.md
Outdated
Show resolved
Hide resolved
edoardopirovano
force-pushed
the
edoardo/3.4-mergeback
branch
2 times, most recently
from
abf0eed to
62ebcf5
Compare
edoardopirovano
force-pushed
the
edoardo/3.4-mergeback
branch
from
62ebcf5 to
1b539eb
Compare
|
Thanks @aeisenberg, looks like I incorrectly resolved the merge conflict with #7355 in favour of the RC branch instead of |
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.
Merges back the
rc/3.4branch intomain.