Merge release 2.12.5 into 2.13.x #125
Merged
Conversation
This file contains 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Chunk from PR#111 by Cédric Anne <cedric.anne@gmail.com> Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Updates the CHANGELOG.md file to add a changelog entry for a new 2.12.5 version.
Fix Invalid header line for Content-Disposition string - incomplete continuation
Updates the CHANGELOG.md to set the release date.
|
besides the changelog conflict, there seems to be some flaw in the process, for example, 2.12.5 was released without 2.12.4 changelog. |
|
Yep, fairly sure something went wrong in deciding where to put the TBH, I'm vouching for getting rid of it: got stuck with another task today, otherwise would already have proceeded to merge both this and your CS improvements patch today, @glensc |
Ocramius
deleted the
2.12.x-merge-up-into-2.13.x_5fedb90cbeb0c0.23833413
branch
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.
Release Notes for 2.12.5
2.12.x bugfix release (patch)
2.12.5
Bug