merge: resolve v1.22.0 conflicts with custom

Browse Source

...

This commit is contained in:

mbatchelder

2026-08-31 07:37:26 -04:00

parent bdda3c36bc 6b2b12382e

commit 119caff03c

200 changed files with 44922 additions and 775 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

.github/pr-evidence/dark-git-page.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 145 KiB

.github/pr-evidence/dark-projects-page.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 146 KiB

.github/pr-evidence/evidence-link-dialog.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 182 KiB

.github/pr-evidence/evidence-link-filled.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 182 KiB

.github/pr-evidence/evidence-session-open.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 168 KiB

.github/pr-evidence/evidence-work-status.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 182 KiB

.github/pr-evidence/forge-gitea-connected.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 152 KiB

.github/pr-evidence/light-git-page.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 156 KiB

.github/pr-evidence/light-projects-page.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 156 KiB

.github/pr-evidence/narrow-dark-projects-page.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 56 KiB