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 25.1.x back into main #5586

Merged
merged 2 commits into from
Jan 14, 2025
Merged

Merge 25.1.x back into main #5586

merged 2 commits into from
Jan 14, 2025

Conversation

ForgottenProgramme
Copy link
Contributor

@ForgottenProgramme ForgottenProgramme commented Jan 14, 2025

Description

Xref #5578

Warning

DO NOT SQUASH MERGE!

ForgottenProgramme and others added 2 commits January 14, 2025 14:19
* Update .authors.yml

* Update .mailmap

* Update news

* Updated authorship for 25.1.0

* Updated authorship for 25.1.0

* Updated CHANGELOG for 25.1.0

* Updated authorship for 25.1.0

* add first time contributors

* add missing changelog item
@ForgottenProgramme ForgottenProgramme requested a review from a team as a code owner January 14, 2025 17:18
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Jan 14, 2025
@kenodegard kenodegard changed the title Merge 25.1.x back into main Merge 25.1.x back into main Jan 14, 2025
@kenodegard kenodegard merged commit 022cb23 into main Jan 14, 2025
27 checks passed
@kenodegard kenodegard mentioned this pull request Jan 14, 2025
27 tasks
Copy link

codspeed-hq bot commented Jan 14, 2025

CodSpeed Performance Report

Merging #5586 will not alter performance

Comparing 25.1.x (6873259) with 25.1.x (9996971)

Summary

✅ 5 untouched benchmarks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Status: 🏁 Done
Development

Successfully merging this pull request may close these issues.

4 participants