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

Port changes from 3.26.x release branch to main #4973

Merged
merged 3 commits into from
Aug 29, 2023
Merged

Conversation

jezdez
Copy link
Member

@jezdez jezdez commented Aug 18, 2023

Description

Just forward-porting the changes

jezdez and others added 3 commits July 27, 2023 17:50
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Conda Bot <[email protected]>
Co-authored-by: Ken Odegard <[email protected]>
Co-authored-by: Jannis Leidel <[email protected]>
Co-authored-by: Bianca Henderson <[email protected]>
Co-authored-by: conda-bot <[email protected]>
fix islist (#4184)
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Aug 18, 2023
@kenodegard
Copy link
Contributor

kenodegard commented Aug 29, 2023

looks like this needs to be a merge commit and not a squash merge, is that correct @jezdez?

@kenodegard kenodegard merged commit d3b7177 into main Aug 29, 2023
10 checks passed
@kenodegard kenodegard deleted the main-3.26.x-merge branch August 29, 2023 22:10
@github-actions github-actions bot added the locked [bot] locked due to inactivity label Aug 29, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 29, 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