Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(merge): '8.2.11' into 'main' #4852

Merged
merged 2 commits into from
Jun 14, 2024
Merged

chore(merge): '8.2.11' into 'main' #4852

merged 2 commits into from
Jun 14, 2024

Conversation

mr-cal
Copy link
Collaborator

@mr-cal mr-cal commented Jun 13, 2024

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • Have you successfully run tox run -m lint?
  • Have you successfully run tox run -e test-py310? (supported versions: py39, py310, py311, py312)

This was a clean merge except for a minor conflict between #4841 and #4732 in snapcraft.application.Application._get_dispatcher().

@mr-cal
fix: re-register dotnet for core22 (#4841)
f8cf313 
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
@mr-cal
chore(merge): '8.2.11' into 'merge/8.2.11'
c8ab46e
@mr-cal mr-cal requested a review from a team June 13, 2024 21:02
@lengau lengau added the merge label Jun 14, 2024
@lengau lengau requested a review from a team June 14, 2024 14:29
@sergiusens sergiusens merged commit a6047cd into main Jun 14, 2024
9 of 10 checks passed
@sergiusens sergiusens deleted the merge/8.2.11 branch June 14, 2024 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lengau lengau lengau approved these changes

@sergiusens sergiusens sergiusens approved these changes

Assignees
No one assigned
Labels
merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mr-cal @sergiusens @lengau