Skip to content

馃 Merge 8.6.x-sync into master - #964

Merged
oliver-sanders merged 4 commits into
masterfrom
8.6.x-sync
Aug 26, 2026
Merged

馃 Merge 8.6.x-sync into master#964
oliver-sanders merged 4 commits into
masterfrom
8.6.x-sync

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

This is an automated "sync" PR

We maintain bugfix branches in this repository in order to allow us to continue developing bugfixes for older versions, while simultaneously developing features for newer versions.

When bugfix PRs are merged into a bugfix branch, a "sync" PR is automatically created to merge a copy of the bugfix branch into the next feature branch (usually master). The author of the bugfix typically reviews and merges this PR.

What you are reviewing here are the original bugfix(es) in the context of the new branch. Sometimes changes need to be made as part of this porting:

  • To resolve conflicts.
  • If there are (non-conflicting) incompatible changes in different parts of the codebase.

If any changes are required -> please push new commits to this branch and assign someone else to review them.

Otherwise -> please approve and merge this PR.

Important

Please do a normal merge, not squash merge.


Triggered by push

* jinja2: improve docs for globals, filters and tests

* Apply suggestions from code review

Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>

---------

Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
@github-actions github-actions Bot added the sync Merging or cherry-picking changes from a version branch into master label Aug 25, 2026
@oliver-sanders
oliver-sanders merged commit 51d2260 into master Aug 26, 2026
5 checks passed
@oliver-sanders
oliver-sanders deleted the 8.6.x-sync branch August 26, 2026 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

sync Merging or cherry-picking changes from a version branch into master

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants