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.

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

Merge 3.26.x branch back into main #4941

Merged
merged 1 commit into from
Jul 25, 2023
Merged

Merge 3.26.x branch back into main #4941

merged 1 commit into from
Jul 25, 2023

Conversation

kenodegard
Copy link
Contributor

Description

Merges release branch (with changelog changes) back into main.

Xref #4926

Warning
DO NOT SQUASH MERGE!

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Jul 25, 2023
@kenodegard kenodegard mentioned this pull request Jul 25, 2023
20 tasks
@kenodegard kenodegard merged commit 655dbe1 into main Jul 25, 2023
19 checks passed
@github-actions github-actions bot added the locked [bot] locked due to inactivity label Jul 25, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla-signed [bot] added once the contributor has signed the CLA locked [bot] locked due to inactivity
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants